【修改】恢复用户表ID自动生成，IAM的数据用工号作为唯一标识

laws-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -568,7 +568,6 @@ public class SysUserController {
                     String salt = oConvertUtils.randomGen(8);
                     sysUserExcel.setSalt(salt);
                     String passwordEncode = PasswordUtil.encrypt(sysUserExcel.getUsername(), sysUserExcel.getPassword(), salt);
-                    sysUserExcel.setId(UUIDUtils.randomUUID(32));
                     sysUserExcel.setPassword(passwordEncode);
                     SuccessAndErrorLines successAndErrorLines = this.saveAndErrorLines(errorMessage, successLines, errorLines, i, sysUserExcel);
                     successLines = successAndErrorLines.getSuccessLines();
@@ -576,7 +575,6 @@ public class SysUserController {
                     // 批量将部门和用户信息建立关联关系 TODO 错误需修改
                     String departIds = sysUserExcel.getDepartIds();
                     this.saveUser(sysUserExcel, departIds);
-
                 }
             } catch (Exception e) {
                 errorMessage.add("发生异常：" + e.getMessage());

laws-module-system/src/main/java/com/jero/modules/system/entity/SysUser.java

@@ -34,7 +34,7 @@ public class SysUser implements Serializable {
     /**
      * id
      */
-    @TableId(type = IdType.INPUT)
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -15,7 +15,6 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.system.vo.SysUserCacheInfo;
 import com.jero.common.util.PasswordUtil;
 import com.jero.common.util.UUIDGenerator;
-import com.jero.common.util.UUIDUtils;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.base.service.BaseCommonService;
 import com.jero.modules.system.entity.*;
@@ -466,7 +465,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void saveUser(SysUser user, String selectedRoles, String selectedDeparts) {
-		user.setId(UUIDUtils.randomUUID(32));
 		//step.1 保存用户
 		// 对手机号、邮箱进行加密处理
 		this.proceedUserInfoEncrypt(user);