导入模版修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -58,12 +58,12 @@ public class SysProfileController extends BaseController {
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping
     public R<Void> updateProfile(@RequestBody SysUser user) {
-        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        }
-        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-        }
+//        if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+//            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+//        }
+//        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+//            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+//        }
         user.setUserId(getUserId());
         user.setUserName(null);
         user.setPassword(null);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -160,10 +160,10 @@ public class SysUserController extends BaseController {
         deptService.checkDeptDataScope(user.getDeptId());
         if (!userService.checkUserNameUnique(user)) {
             return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
-            return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
-        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
-            return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+//        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+//            return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在");
+//        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+//            return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         user.setPassword(BCrypt.hashpw(user.getPassword()));
         return toAjax(userService.insertUser(user));
@@ -181,10 +181,10 @@ public class SysUserController extends BaseController {
         deptService.checkDeptDataScope(user.getDeptId());
         if (!userService.checkUserNameUnique(user)) {
             return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在");
-        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
-        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
-            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
+//        } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
+//            return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在");
+//        } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) {
+//            return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
         }
         return toAjax(userService.updateUser(user));
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysUserImportVo.java

@@ -1,5 +1,6 @@
 package com.ruoyi.system.domain.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
@@ -23,13 +24,15 @@ public class SysUserImportVo implements Serializable {
     /**
      * 用户ID
      */
-    @ExcelProperty(value = "用户序号")
+//    @ExcelProperty(value = "用户序号")
+    @ExcelIgnore
     private Long userId;
 
     /**
      * 部门ID
      */
-    @ExcelProperty(value = "部门编号")
+//    @ExcelProperty(value = "部门编号")
+    @ExcelIgnore
     private Long deptId;
 
     /**
@@ -47,7 +50,8 @@ public class SysUserImportVo implements Serializable {
     /**
      * 用户邮箱
      */
-    @ExcelProperty(value = "用户邮箱")
+//    @ExcelProperty(value = "用户邮箱")
+    @ExcelIgnore
     private String email;
 
     /**
@@ -59,15 +63,20 @@ public class SysUserImportVo implements Serializable {
     /**
      * 用户性别
      */
-    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_user_sex")
+//    @ExcelProperty(value = "用户性别", converter = ExcelDictConvert.class)
+//    @ExcelDictFormat(dictType = "sys_user_sex")
+    @ExcelIgnore
     private String sex;
 
     /**
      * 帐号状态（0正常 1停用）
      */
-    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(dictType = "sys_normal_disable")
+//    @ExcelProperty(value = "帐号状态", converter = ExcelDictConvert.class)
+//    @ExcelDictFormat(dictType = "sys_normal_disable")
+    @ExcelIgnore
     private String status;
+    @ExcelProperty(value = "用户类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_user_type")
+    private String userType;
 
 }

ruoyi-zdsz/src/main/resources/mapper/zdsz/ZAreaMapper.xml

@@ -50,7 +50,7 @@
             za.NAME AS areaName,
             sd.dict_label AS district,
             zb.NAME AS buildName,
-            zn.NAME AS unitName,
+            IF(zn.NAME = '无','',zn.NAME) AS unitName,
             zh.NAME AS houseName,
             zh.id_card AS idCard,
             zh.phone AS phone,