从源更新

2019-05-05 09:33:39 +08:00
parent efa030618a d62e6a5d5e
commit 3ae6fb2f50
40 changed files with 3447 additions and 144 deletions
--- a/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/src/main/java/com/jsh/erp/controller/UserController.java
@@ -350,6 +350,7 @@ public class UserController {
        ue.setUsername(loginame);
        ue.setLoginame(loginame);
        ue.setPassword(password);
+        userService.checkUserNameAndLoginName(ue); //检查用户名和登录名
        ue = userService.registerUser(ue,manageRoleId);
        /**
         * create by: qiankunpingtai