用户上传接口判断修改

base-common/src/main/java/com/ozs/common/enums/BusinessType.java

@@ -12,6 +12,15 @@ public enum BusinessType
      */
     OTHER,
 
+    /**
+     * 查询
+     */
+    SELECT,
+
+    /**
+     * 详情信息
+     */
+    MESSAGE,
     /**
      * 新增
      */

base-generator/src/main/resources/vm/java/controller.java.vm

@@ -42,6 +42,7 @@ public class ${ClassName}Controller extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
     @GetMapping("/list")
+    @Log(title = "${functionName}", businessType = BusinessType.SELECT)
 #if($table.crud || $table.sub)
     public TableDataInfo list(${ClassName} ${className})
     {
@@ -74,6 +75,7 @@ public class ${ClassName}Controller extends BaseController
      * 获取${functionName}详细信息
      */
     @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
+    @Log(title = "${functionName}", businessType = BusinessType.MESSAGE)
     @GetMapping(value = "/{${pkColumn.javaField}}")
     public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
     {

base-system/src/main/java/com/ozs/system/service/impl/SysUserServiceImpl.java

@@ -541,45 +541,43 @@ public class SysUserServiceImpl extends JoinServiceImpl<SysUserMapper, SysUser>
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
                 if (StringUtils.isNull(u)) {
                     if (!ObjectUtils.isEmpty(user.getPhoneNum())
-                            && UserConstants.NOT_UNIQUE.equals(userMapper.checkPhoneUnique(user.getPhoneNum()))) {
+                            && UserConstants.NOT_UNIQUE.equals(checkPhoneUnique(sysUser))) {
                         errMsg.append("手机号码:" + user.getPhoneNum() + "已存在");
-                    }else {
-                        if (!ObjectUtils.isEmpty(user.getEmail())
-                                && UserConstants.NOT_UNIQUE.equals(userMapper.checkEmailUnique(user.getEmail()))) {
-                            errMsg.append("邮箱:" + user.getEmail() + "已存在");
-                        } else {
-                            BeanValidators.validateWithException(validator, user);
-                            sysUser.setPassword(SecurityUtils.encryptPassword(password));
-                            sysUser.setCreateBy(operName);
-                            sysUser.setUpdateBy(operName);
-                            sysUser.setUserId(IdUtils.fastSimpleUUID());
-                            SysDept sysDept = deptMapper.selectDeptByDeptName(user.getDeptName());
-                            if (ObjectUtils.isEmpty(sysDept)) {
-                                errMsg.append("部门名称:" + user.getDeptName() + "不存在");
-                            } else {
-                                sysUser.setDeptId(sysDept.getDeptId());
-                                sysUser.setPassword(SecurityUtils.encryptPassword(defaultPassword));
-                                this.insertUser(sysUser);
-                                SysUser sysUser1 = userMapper.selectUserByUserName(user.getUserName());
-                                String roleName = sysUser.getRoleName();
-                                String[] split = roleName.split(",");
-                                if (StringUtils.isNotEmpty(split)) {
-                                    List<Long> id = new ArrayList<>();
-                                    for (int i = 0; i < split.length; i++) {
-                                        Long roleId = roleMapper.getRoleId(split[i]);
-                                        List<SysUserRole> list = new ArrayList<SysUserRole>(id.size());
-                                        SysUserRole ur = new SysUserRole();
-                                        ur.setUserId(sysUser1.getId());
-                                        ur.setRoleId(roleId);
-                                        list.add(ur);
-                                        userRoleMapper.batchUserRole(list);
-                                    }
-                                }
-                                successNum++;
-                                successMsg.append(successNum + "、账号 " + user.getUserName() + " 导入成功");
-                            }
+                        int a=10/0;
+                    }else if (!ObjectUtils.isEmpty(user.getEmail())
+                            && UserConstants.NOT_UNIQUE.equals(checkEmailUnique(sysUser))) {
+                        errMsg.append("邮箱:" + user.getEmail() + "已存在");
+                        int a=10/0;
+                    }
+                    BeanValidators.validateWithException(validator, user);
+                    sysUser.setPassword(SecurityUtils.encryptPassword(password));
+                    sysUser.setCreateBy(operName);
+                    sysUser.setUpdateBy(operName);
+                    sysUser.setUserId(IdUtils.fastSimpleUUID());
+                    SysDept sysDept = deptMapper.selectDeptByDeptName(user.getDeptName());
+                    if (ObjectUtils.isEmpty(sysDept)) {
+                        errMsg.append("部门名称:" + user.getDeptName() + "不存在");
+                    }
+                    sysUser.setDeptId(sysDept.getDeptId());
+                    sysUser.setPassword(SecurityUtils.encryptPassword(defaultPassword));
+                    this.insertUser(sysUser);
+                    SysUser sysUser1 = userMapper.selectUserByUserName(user.getUserName());
+                    String roleName = sysUser.getRoleName();
+                    String[] split = roleName.split(",");
+                    if (StringUtils.isNotEmpty(split)) {
+                        List<Long> id = new ArrayList<>();
+                        for (int i = 0; i < split.length; i++) {
+                            Long roleId = roleMapper.getRoleId(split[i]);
+                            List<SysUserRole> list = new ArrayList<SysUserRole>(id.size());
+                            SysUserRole ur = new SysUserRole();
+                            ur.setUserId(sysUser1.getId());
+                            ur.setRoleId(roleId);
+                            list.add(ur);
+                            userRoleMapper.batchUserRole(list);
                         }
                     }
+                    successNum++;
+                    successMsg.append(successNum + "、账号 " + user.getUserName() + " 导入成功");
                 } else if (isUpdateSupport) {
                     BeanValidators.validateWithException(validator, user);
 //                    checkUserAllowed(sysUser);