人员优化

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -92,8 +92,8 @@ public class SysUserController extends BaseController {
         ajax.put("data", sysUserTableDataInfo);
         boolean admin = false;
         SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
-        if (null!=sysUser&&"Y".equals(sysUser.getIsManage())){
-            admin=true;
+        if (null != sysUser && "Y".equals(sysUser.getIsManage())) {
+            admin = true;
         }
  /*       String s = roleService.selectRoleNameByUserId(SecurityUtils.getUserId());
         if (StringUtils.isNotEmpty(s)) {
@@ -221,13 +221,15 @@ public class SysUserController extends BaseController {
             sysUser.setRoles(roles);
             String sex = "-";
             String status = "禁用";
-            if (null != sysUser&&null!=sysUser.getGender()) {
-                if (sysUser.getGender().equals("1")) {
-                    sex = "女";
-                }else {
-                    sex="男";
+            if (null != sysUser) {
+                if (null != sysUser.getGender()) {
+                    if (sysUser.getGender().equals("1")) {
+                        sex = "女";
+                    } else {
+                        sex = "男";
+                    }
                 }
-                if (sysUser.getIsLock().equals("1")) {
+                if (sysUser.getIsLock().equals("0")) {
                     status = "启用";
                 }
             }
@@ -480,12 +482,12 @@ public class SysUserController extends BaseController {
      */
     @RequiresPermissions("system:user:export")
     @PostMapping("/export")
-    public void export(SysUser user, HttpServletResponse response)  {
-        List<UserExport> list=userService.down(user);
+    public void export(SysUser user, HttpServletResponse response) {
+        List<UserExport> list = userService.down(user);
         if (ObjectUtil.isEmpty(list)) {
             throw new RuntimeException("导出数据为空!");
         }
-        if(list.size()>10000){
+        if (list.size() > 10000) {
             throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
         }
         try {
@@ -503,18 +505,19 @@ public class SysUserController extends BaseController {
             response.setCharacterEncoding("utf-8");
         }
     }
+
     /**
      * 导出管理人员数据
      */
     @RequiresPermissions("system:user:exportManager")
     @PostMapping("/exportManager")
-    public void exportManager(SysUser user, HttpServletResponse response)  {
-        List<UserExport> list=userService.down(user);
+    public void exportManager(SysUser user, HttpServletResponse response) {
+        List<UserExport> list = userService.down(user);
         if (ObjectUtil.isEmpty(list)) {
             throw new RuntimeException("导出数据为空!");
         }
-        list=list.stream().filter(e -> "Y".equals(e.getIsManager())).collect(Collectors.toList());
-        if(list.size()>10000){
+        list = list.stream().filter(e -> "Y".equals(e.getIsManager())).collect(Collectors.toList());
+        if (list.size() > 10000) {
             throw new RuntimeException("导出数据量过大（单次导出限量10000条数据），请填写条件分批导出");
         }
         try {
@@ -532,6 +535,7 @@ public class SysUserController extends BaseController {
             response.setCharacterEncoding("utf-8");
         }
     }
+
     /**
      * 导入
      */
@@ -539,7 +543,7 @@ public class SysUserController extends BaseController {
     @ResponseBody
     @PostMapping("/importData")
     @Transactional(rollbackFor = {RuntimeException.class, Exception.class})
-    public  AjaxResult importData(MultipartFile file, boolean updateSupport){
+    public AjaxResult importData(MultipartFile file, boolean updateSupport) {
         List<UserExport> list = new ArrayList<>();
         // 读取excel
         EasyExcel.read(multipartFileToFile(file), UserExport.class, new AnalysisEventListener<UserExport>() {
@@ -549,25 +553,26 @@ public class SysUserController extends BaseController {
 //                System.out.println("解析数据为:" + user.toString());
                 list.add(user);
             }
+
             // 全部解析完成被调用
             @Override
             public void doAfterAllAnalysed(AnalysisContext analysisContext) {
 //                System.out.println("解析完成...");
-                List<String> names=list.stream().map(UserExport::getName).collect(Collectors.toList());
+                List<String> names = list.stream().map(UserExport::getName).collect(Collectors.toList());
                 List<String> exist = userService.selectCountByNames(names);
-                if (exist.size()>0){
-                    throw new RuntimeException("用户"+exist+"已存在");
+                if (exist.size() > 0) {
+                    throw new RuntimeException("用户" + exist + "已存在");
                 }
                 // 将解析的数据保存到数据库
-                for (UserExport u :list) {
+                for (UserExport u : list) {
                     //构建基础user对象
-                    SysUser user=new SysUser();
-                    BeanUtils.copyProperties(u,user);
+                    SysUser user = new SysUser();
+                    BeanUtils.copyProperties(u, user);
                     user.setDeleted(0);
-                    user.setIsLock("启用".equals(u.getIsLock())?"1":"0");
-                    SysOrg org= orgMapper.selectOne(new LambdaQueryWrapper<SysOrg>().eq(SysOrg::getName,u.getOrgName()).eq(SysOrg::getDeleted,0));
-                    if (org==null){
-                        throw new RuntimeException("机构"+u.getOrgName()+"不存在");
+                    user.setIsLock("启用".equals(u.getIsLock()) ? "1" : "0");
+                    SysOrg org = orgMapper.selectOne(new LambdaQueryWrapper<SysOrg>().eq(SysOrg::getName, u.getOrgName()).eq(SysOrg::getDeleted, 0));
+                    if (org == null) {
+                        throw new RuntimeException("机构" + u.getOrgName() + "不存在");
                     }
                     user.setOrgName(org.getName());
                     user.setOrgPath(org.getPath());
@@ -583,10 +588,10 @@ public class SysUserController extends BaseController {
                     user.setOriginalOrgId(user.getOrgId());
                     userService.insertUser(user);
                     //构建用户角色关联关系
-                    String [] roleNames = user.getRoleNames().split(",");
+                    String[] roleNames = user.getRoleNames().split(",");
                     List<SysRole> roles = roleService.list(new LambdaQueryWrapper<SysRole>().in(SysRole::getRoleName, roleNames));
-                    if (roles.size()!=roleNames.length){
-                        throw new RuntimeException("角色"+ Arrays.toString(roleNames) +"存在异常");
+                    if (roles.size() != roleNames.length) {
+                        throw new RuntimeException("角色" + Arrays.toString(roleNames) + "存在异常");
                     }
                     for (SysRole r :
                             roles) {
@@ -600,12 +605,13 @@ public class SysUserController extends BaseController {
         }).sheet().doRead();
         return success();
     }
+
     /***
      * 功能描述:
      * MultipartFile 转 File
      * @return: java.io.File
      */
-    public static File multipartFileToFile(MultipartFile multipartFile){
+    public static File multipartFileToFile(MultipartFile multipartFile) {
         // 获取文件名
         String fileName = multipartFile.getOriginalFilename();
         // 获取文件后缀
@@ -613,7 +619,7 @@ public class SysUserController extends BaseController {
         String suffix = fileName.substring(fileName.lastIndexOf("."));
         // 若需要防止临时文件重复，需要在文件名后加上UUID
         try {
-            File file = File.createTempFile(fileName.substring(0,fileName.lastIndexOf("."))+ UUID.randomUUID(),suffix);
+            File file = File.createTempFile(fileName.substring(0, fileName.lastIndexOf(".")) + UUID.randomUUID(), suffix);
             multipartFile.transferTo(file);
             return file;
         } catch (IOException e) {