用户注册修复

core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java

@@ -717,11 +717,11 @@ public class LoginPwdController extends BaseController {
         wrapper.eq("account", account);
         List<SysUser> users = sysUserMapper.selectList(wrapper);
         if (users.size() != 0) {
-            return ResponseData.error("账号已被使用，请换一个账号！");
+            return ResponseData.error("账号已被使用，请联系管理员！");
         }
 
         Wrapper<HhrUser> wrapper1 = new EntityWrapper<>();
-        wrapper1.eq("id_card", account);
+        wrapper1.eq("id_card", idCard);
         List<HhrUser> hhrUsers = hhrUserMapper.selectList(wrapper1);
         if (hhrUsers.size() != 0) {
             return ResponseData.error("一个身份证只能创建一个账号，请换一个身份证！");

service-manager/src/main/java/com/winsun/controller/NewUserController.java

@@ -210,13 +210,13 @@ public class NewUserController extends BaseController {
             }
             for (SysUser sysUser : sysUserList) {
                 if(sysUser.getId().equals(id)){
+                    objectMap.put("account",sysUser.getAccount());
                     objectMap.put("name",sysUser.getName());
                     objectMap.put("phone",sysUser.getPhone());
                     objectMap.put("sex",sysUser.getSex());
                     objectMap.put("status",sysUser.getStatus());
                     objectMap.put("createtime",sysUser.getCreatetime());
                     objectMap.put("updateTime",sysUser.getUpdateTime());
-
                     break;
                 }
             }

service-manager/src/main/java/com/winsun/controller/PartnerController.java

@@ -77,7 +77,7 @@ public class PartnerController extends BaseController {
 			password = StringUtils.isNotBlank(password) ? MD5Utils.md5(password, user.getSalt()) : user.getPassword();
 			parentId = null == parentId ? "" : parentId.replaceAll("null", "");
 			parentIds = null == parentIds ? "" : parentIds.replaceAll("null", "");
-			if (StringUtils.isBlank(ysm)) {
+			if (StringUtils.isBlank(ysm)||"null".equals(ysm)) {
 				ysm = "1";
 			}
 			int updateSysUse = partnerMapper.updateSysUser(phone, name, account, sex, password,roleId, id);