完善用户新增功能，增加身份证号验证

src/main/java/com/xzxtshiro/controller/admin/SysUserController.java

@@ -153,12 +153,9 @@ public class SysUserController {
     @RequestMapping(value = "/add", method = RequestMethod.POST)
     public String add(SysUser user, Model model) {
         SysUser add = userService.add(user);
-        if (add.getUsername() == null) {
-            setZtreeData(model,userService,dictitemService,roleService);
-            model.addAttribute("user", user);
-            model.addAttribute("msg", "用户名已存在,请修改用户名!");
-            return "admin/user/add";
-        } else {
+        String msg = "";
+        String reStr = "";
+        if("".equals(add.getReason())){
             //用户增加成功，同步警综信息
             SysUser dlUser = TokenUtil.getUser();
             String unit = dlUser.getUnitcode();
@@ -171,6 +168,18 @@ public class SysUserController {
                 tbJZuserxx(user);
             }
             return "redirect:/admin/user/index?msg=success";
+        }else{
+            if ("username".equals(add.getReason())) {
+                msg = "用户名已存在,请修改用户名!";
+                reStr = "admin/user/add";
+            }else if("identitycard".equals(add.getReason())){
+                msg = "身份证号已存在,请修改身份证号码!";
+                reStr = "admin/user/add";
+            }
+            setZtreeData(model,userService,dictitemService,roleService);
+            model.addAttribute("user", user);
+            model.addAttribute("msg",msg);
+            return reStr;
         }
     }
 

src/main/java/com/xzxtshiro/dao/SysUserDao.java

@@ -16,7 +16,7 @@ public interface SysUserDao {
 
     List<SysRole> selectSysRolesByUserId(String userId);
 
-    SysUser findByUserName(String username);
+    SysUser findByCondition(SysUser username);
 
     List<String> selectSysRoleIdByUserId(String userId);
 

src/main/java/com/xzxtshiro/mapper/SysUserMapper.xml

@@ -452,14 +452,15 @@
           where  A.USER_ID=#{userId,jdbcType=VARCHAR} and A.ROLE_ID=b.id
   </select>
 
-  <!--根据用户名查询用户-->
-  <select id="findByUserName" parameterType="string" resultMap="BaseResultMap">
+  <!--根据用户名/身份证号查询用户-->
+  <select id="findByCondition" parameterType="com.xzxtshiro.pojo.SysUser" resultMap="BaseResultMap">
     SELECT
      <include refid="Base_Column_List"/>
     FROM
        Sys_user
-    WHERE
-       USERNAME=#{username,jdbcType=VARCHAR} and scbz=0
+    WHERE  scbz=0
+    <if test="username !=null"> and USERNAME=#{username,jdbcType=VARCHAR}</if>
+    <if test="identitycard !=null"> and IDENTITYCARD=#{identitycard,jdbcType=VARCHAR}</if>
   </select>
 <!--根据用户id查询角色id-->
   <select id="selectSysRoleIdByUserId" parameterType="String" resultType="String">

src/main/java/com/xzxtshiro/pojo/SysUser.java

@@ -112,5 +112,8 @@ public class SysUser extends BaseModel implements Serializable {
     /**批量授权的用户id合集*/
     protected String ids;
 
+    //保存失败的原因
+    protected String reason;
+
     
 }
\ No newline at end of file

src/main/java/com/xzxtshiro/service/imp/SysUserServiceImpl.java

@@ -37,7 +37,9 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public SysUser login(String username, String password) {
-        SysUser user = userDao.findByUserName(username);
+        SysUser user =new SysUser();
+        user.setUsername(username);
+        user = userDao.findByCondition(user);
         // 密码匹配的工作交给 Shiro 去完成
         if (user == null) {
             // 因为缓存切面的原因,在这里就抛出用户名不存在的异常
@@ -129,9 +131,21 @@ public class SysUserServiceImpl implements SysUserService {
         Base64PasswordEncrypter base = new Base64PasswordEncrypter();
         password = base.encryptPassword(password);
         user.setPassword(password);
-        SysUser u = userDao.findByUserName(user.getUsername());
+        SysUser userNameCheck = new SysUser();
+        userNameCheck.setUsername(user.getUsername());
+        userNameCheck  =userDao.findByCondition(userNameCheck);
+
+        SysUser idcardCheck = new SysUser();
+        idcardCheck.setIdentitycard(user.getIdentitycard());
+        idcardCheck = userDao.findByCondition(idcardCheck);
+
+
         //判断要插入的目标对象是否存在
-        if (u == null) {
+        if(userNameCheck!=null){
+            user.setReason("username");
+        }else if (idcardCheck !=null){
+            user.setReason("identitycard");
+        }else{
             String userId = SequenceUtil.getNextXxzjbh();
             user.setId(userId);
             user.setLrr(dlUser.getUsername());
@@ -169,9 +183,7 @@ public class SysUserServiceImpl implements SysUserService {
                 }
                 int j = userDao.batchAddSysUserRole(userRoles);
             }
-        } else {
-            System.out.println("保存失败");
-            user = new SysUser();
+            user.setReason("");
         }
         return user;
     }
@@ -282,7 +294,9 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public SysUser loadByUsername(String username) {
-        return userDao.findByUserName(username);
+        SysUser user = new SysUser();
+        user.setUsername(username);
+        return userDao.findByCondition(user);
     }
 
     @Override

src/main/webapp/WEB-INF/jsp/admin/user/add.jsp

@@ -274,8 +274,22 @@
         //设置用户等级和三员回显
         var grade = "${user.grade}";
         $("#grade").val(grade);
-        form.render('select');
+        //设置三员回显
+        var gzzmPlay = "${user.gzzmPlay}";
+        //获取复选框选中的值
+        var groupCheckbox=$("input[name='gzzmPlay']");
+        for (var i = 0; i < groupCheckbox.length; i++) {
+            var val =groupCheckbox[i].value;
+            if(gzzmPlay.split(',').indexOf(val)!=-1){
+                groupCheckbox[i].checked=true;
+            }
+        }
+
+        //出生日期转化
+        var birthday = "${user.birthday}";
+        $("#birthday").val(formatTime(birthday));
 
+        form.render();
 
         var data = ${unit};
         var zNodes =[];

src/main/webapp/WEB-INF/jsp/admin/user/update.jsp

@@ -284,13 +284,12 @@
                 groupCheckbox[i].checked=true;
             }
         }
-        form.render();
 
         //出生日期转化
         var birthday = "${user.birthday}";
         $("#birthday").val(formatTime(birthday));
 
-
+        form.render();
         var data = ${unit};
         var zNodes =[];