审计代码修复同步

zd-gateway/src/main/java/com/zd/gateway/ZdGatewayApplication.java

@@ -9,6 +9,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
+import org.springframework.util.StringUtils;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -23,25 +24,22 @@ import java.net.UnknownHostException;
 public class ZdGatewayApplication {
     static Logger logger = LoggerFactory.getLogger(ZdGatewayApplication.class);
 
-    public static void main(String[] args) {
+    public static void main(String[] args) throws UnknownHostException {
         ConfigurableApplicationContext run = ZdStartApplication.run(ApplicationConstants.GATEWAY_SERVICE, ZdGatewayApplication.class, args);
         Environment env = run.getEnvironment();
-        try {
-            logger.info("\n----------------------------------------------------------\n\t" +
-                            "Application '{}' is running! Access URLs:\n\t" +
-                            "Local: \t\thttp://localhost:{}\n\t" +
-                            "External: \thttp://{}:{}\n\t" +
-                            "文档地址: \thttp://{}:{}/doc.html\n\t" +
-                            "----------------------------------------------------------",
-                    env.getProperty("spring.application.name"),
-                    env.getProperty("server.port"),
-                    InetAddress.getLocalHost().getHostAddress(),
-                    env.getProperty("server.port"),
-                    InetAddress.getLocalHost().getHostAddress(),
-                    env.getProperty("server.port")
-            );
-        } catch (UnknownHostException e) {
-            e.printStackTrace();
-        }
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        logger.info("\n----------------------------------------------------------\n\t" +
+                        " Application {} is started， 运行环境: {} \n\t" +
+                        " Nacos evn: server-addr = {} , namespace = {} \n\t" +
+                        " Local Addr: \thttp://{}:{}\n\t" +
+                        " Swagger API: \thttp://{}:{}/doc.html\n\t" +
+                        "----------------------------------------------------------",
+                env.getProperty("spring.application.name"),
+                StringUtils.arrayToCommaDelimitedString(env.getActiveProfiles()),
+                env.getProperty("spring.cloud.nacos.config.server-addr"),
+                env.getProperty("spring.cloud.nacos.config.namespace"),
+                ip, port, ip, port
+        );
     }
 }

zd-gateway/src/main/java/com/zd/gateway/config/KaptchaTextCreator.java

@@ -1,8 +1,9 @@
 package com.zd.gateway.config;
 
+import java.security.SecureRandom;
 import java.util.Random;
-
 import com.google.code.kaptcha.text.impl.DefaultTextCreator;
+import lombok.SneakyThrows;
 
 /**
  * 验证码文本生成器
@@ -12,21 +13,22 @@ import com.google.code.kaptcha.text.impl.DefaultTextCreator;
 public class KaptchaTextCreator extends DefaultTextCreator {
     private static final String[] CNUMBERS = "0,1,2,3,4,5,6,7,8,9,10".split(",");
 
+    @SneakyThrows
     @Override
     public String getText() {
         Integer result = 0;
-        Random random = new Random();
+        Random random = SecureRandom.getInstanceStrong();
         int x = random.nextInt(10);
         int y = random.nextInt(10);
         StringBuilder suChinese = new StringBuilder();
-        int randomoperands = (int) Math.round(Math.random() * 2);
-        if (randomoperands == 0) {
+        int randomOperands = random.nextInt(2);
+        if (randomOperands == 0) {
             result = x * y;
             suChinese.append(CNUMBERS[x]);
             suChinese.append("*");
             suChinese.append(CNUMBERS[y]);
-        } else if (randomoperands == 1) {
-            if (!(x == 0) && y % x == 0) {
+        } else if (randomOperands == 1) {
+            if (x != 0 && y % x == 0) {
                 result = y / x;
                 suChinese.append(CNUMBERS[y]);
                 suChinese.append("/");
@@ -37,7 +39,7 @@ public class KaptchaTextCreator extends DefaultTextCreator {
                 suChinese.append("+");
                 suChinese.append(CNUMBERS[y]);
             }
-        } else if (randomoperands == 2) {
+        } else if (randomOperands == 2) {
             if (x >= y) {
                 result = x - y;
                 suChinese.append(CNUMBERS[x]);

zd-gateway/src/main/java/com/zd/gateway/config/SwaggerProvider.java

@@ -26,14 +26,14 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu
     /**
      * 上传文件存储在本地的根路径
      */
-    @Value("${file.path:/home/upload}")
-    private String localFilePath = "/home/upload";
+    @Value("${file.path}")
+    private String localFilePath;
 
     /**
      * 资源映射路径 前缀
      */
-    @Value("${file.prefix:/statics}")
-    public String localFilePrefix = "/statics";
+    @Value("${file.prefix}")
+    public String localFilePrefix;
 
     /**
      * Swagger2默认的url后缀
@@ -81,10 +81,6 @@ public class SwaggerProvider implements SwaggerResourcesProvider, WebFluxConfigu
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        /** swagger-ui 地址 */
-//        registry.addResourceHandler("/swagger-ui/**")
-//                .addResourceLocations("classpath:/META-INF/resources/webjars/springfox-swagger-ui/");
-
         registry.addResourceHandler(localFilePrefix + "/**")
                 .addResourceLocations("file:" + localFilePath + File.separator);
     }

zd-gateway/src/main/java/com/zd/gateway/filter/AuthFilter.java

@@ -33,8 +33,6 @@ import javax.annotation.Resource;
 public class AuthFilter implements GlobalFilter, Ordered {
     private static final Logger log = LoggerFactory.getLogger(AuthFilter.class);
 
-    private final static long EXPIRE_TIME = BaseConstants.TOKEN_EXPIRE * 60;
-
     // 排除过滤的 uri 地址，nacos自行添加
     @Autowired
     private IgnoreWhiteProperties ignoreWhite;

zd-gateway/src/main/java/com/zd/gateway/filter/ValidateCodeFilter.java

@@ -3,7 +3,6 @@ package com.zd.gateway.filter;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.zd.common.core.exception.CaptchaException;
-import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.utils.ServletUtils;
 import com.zd.gateway.config.properties.CaptchaProperties;
 import com.zd.gateway.service.ValidateCodeService;
@@ -56,8 +55,6 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object> {
                     return chain.filter(exchange);
                 }
                 validateCodeService.checkCapcha(obj.getString(CODE), obj.getString(UUID));
-            } catch (ServiceException e1) {
-                return ServletUtils.webFluxResponseWriter(exchange.getResponse(), e1.getMessage(), e1.getCode());
             } catch (CaptchaException e) {
                 return ServletUtils.webFluxResponseWriter(exchange.getResponse(), e.getMessage());
             }catch (Exception e) {

zd-gateway/src/main/java/com/zd/gateway/handler/GatewayExceptionHandler.java

@@ -1,8 +1,6 @@
 package com.zd.gateway.handler;
 
 import org.springframework.cloud.gateway.support.NotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
@@ -20,7 +18,6 @@ import reactor.core.publisher.Mono;
 @Order(-1)
 @Configuration
 public class GatewayExceptionHandler implements ErrorWebExceptionHandler {
-    private static final Logger log = LoggerFactory.getLogger(GatewayExceptionHandler.class);
 
     @Override
     public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
@@ -37,7 +34,6 @@ public class GatewayExceptionHandler implements ErrorWebExceptionHandler {
         } else {
             msg = "服务异常，请稍后重试";
         }
-        log.error("[网关异常处理]请求路径:{},异常信息:{}", exchange.getRequest().getPath(), ex.getMessage());
         return ServletUtils.webFluxResponseWriter(response, msg);
     }
 }

zd-gateway/src/main/java/com/zd/gateway/handler/SentinelFallbackHandler.java

@@ -14,7 +14,7 @@ import reactor.core.publisher.Mono;
  * @author zd
  */
 public class SentinelFallbackHandler implements WebExceptionHandler {
-    private Mono<Void> writeResponse(ServerResponse response, ServerWebExchange exchange) {
+    private Mono<Void> writeResponse(ServerWebExchange exchange) {
         return ServletUtils.webFluxResponseWriter(exchange.getResponse(), "当前请求量过大，请稍后再试");
     }
 
@@ -26,7 +26,7 @@ public class SentinelFallbackHandler implements WebExceptionHandler {
         if (!BlockException.isBlockException(ex)) {
             return Mono.error(ex);
         }
-        return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange));
+        return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(exchange));
     }
 
     private Mono<ServerResponse> handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) {

zd-gateway/src/main/java/com/zd/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -6,7 +6,6 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.Base64;
 import com.zd.model.constant.BaseConstants;
 import com.zd.model.domain.AjaxResult;
@@ -35,9 +34,6 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
     @Resource(name = "captchaProducerMath")
     private Producer captchaProducerMath;
 
-    /*@Autowired
-    private RedisService redisService;*/
-
     @Resource
     private RedisTemplate<String,Object> redisTemplate;
 
@@ -48,7 +44,7 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
      * 生成验证码
      */
     @Override
-    public AjaxResult createCapcha() throws IOException, CaptchaException {
+    public AjaxResult createCapcha()  {
         AjaxResult ajax = AjaxResult.success();
         boolean captchaOnOff = captchaProperties.getEnabled();
         ajax.put("captchaOnOff", captchaOnOff);
@@ -58,7 +54,8 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();
         String verifyKey = BaseConstants.CAPTCHA_CODE_KEY + uuid;
-        String capStr = null, code = null;
+        String capStr = null;
+        String code = null;
         BufferedImage image = null;
         String captchaType = captchaProperties.getType();
         // 生成验证码
@@ -72,7 +69,6 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
             image = captchaProducer.createImage(capStr);
         }
         redisTemplate.opsForValue().set(verifyKey, code, BaseConstants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
-        //redisService.setCacheObject(verifyKey, code, BaseConstants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
         // 转换流信息写出
         FastByteArrayOutputStream os = new FastByteArrayOutputStream();
         try {
@@ -97,8 +93,6 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
             throw new CaptchaException("验证码已失效");
         }
         String verifyKey = BaseConstants.CAPTCHA_CODE_KEY + uuid;
-        //String captcha = redisService.getCacheObject(verifyKey);
-        //redisService.deleteObject(verifyKey);
         String captcha = (String) redisTemplate.opsForValue().get(verifyKey);
         redisTemplate.delete(verifyKey);
         if (!code.equalsIgnoreCase(captcha)) {

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysClassController.java

@@ -1,33 +1,24 @@
 package com.zd.system.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.ExcelUtil;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.system.domain.SysClass;
 import com.zd.system.service.ISysClassService;
-import com.zd.common.core.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * 班级字典Controller
@@ -37,8 +28,6 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @Api(tags = "【班级字典】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/class")
 public class SysClassController extends BaseController {
     @Autowired
@@ -75,7 +64,7 @@ public class SysClassController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysClass sysClass) throws IOException {
         List<SysClass> list = sysClassService.selectSysClassList(sysClass);
-        ExcelUtil<SysClass> util = new ExcelUtil<SysClass>(SysClass.class);
+        ExcelUtil<SysClass> util = new ExcelUtil<>(SysClass.class);
         util.exportExcel(response, list, "班级字典数据");
     }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysConfigController.java

@@ -61,7 +61,7 @@ public class SysConfigController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysConfig config) throws IOException {
         List<SysConfig> list = configService.selectConfigList(config);
-        ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
+        ExcelUtil<SysConfig> util = new ExcelUtil<>(SysConfig.class);
         util.exportExcel(response, list, "参数数据");
     }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysDictDataController.java

@@ -59,7 +59,7 @@ public class SysDictDataController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictData dictData) throws IOException {
         List<SysDictData> list = dictDataService.selectDictDataList(dictData);
-        ExcelUtil<SysDictData> util = new ExcelUtil<SysDictData>(SysDictData.class);
+        ExcelUtil<SysDictData> util = new ExcelUtil<>(SysDictData.class);
         util.exportExcel(response, list, "字典数据");
     }
 
@@ -79,7 +79,7 @@ public class SysDictDataController extends BaseController {
     public AjaxResult dictType(@PathVariable String dictType) {
         List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
         if (StringUtils.isNull(data)) {
-            data = new ArrayList<SysDictData>();
+            data = new ArrayList<>();
         }
         return AjaxResult.success(data);
     }
@@ -91,7 +91,7 @@ public class SysDictDataController extends BaseController {
     public AjaxResult getVague(SysDictData dict) {
         List<SysDictData> data =  dictDataService.selectDictDataList(dict);
         if (StringUtils.isNull(data)) {
-            data = new ArrayList<SysDictData>();
+            data = new ArrayList<>();
         }
         return AjaxResult.success(data);
     }

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysDictTypeController.java

@@ -54,7 +54,7 @@ public class SysDictTypeController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysDictType dictType) throws IOException {
         List<SysDictType> list = dictTypeService.selectDictTypeList(dictType);
-        ExcelUtil<SysDictType> util = new ExcelUtil<SysDictType>(SysDictType.class);
+        ExcelUtil<SysDictType> util = new ExcelUtil<>(SysDictType.class);
         util.exportExcel(response, list, "字典类型");
     }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysLogininforController.java

@@ -51,7 +51,7 @@ public class SysLogininforController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysLogininfor logininfor) throws IOException {
         List<SysLogininfor> list = logininforService.selectLogininforList(logininfor);
-        ExcelUtil<SysLogininfor> util = new ExcelUtil<SysLogininfor>(SysLogininfor.class);
+        ExcelUtil<SysLogininfor> util = new ExcelUtil<>(SysLogininfor.class);
         util.exportExcel(response, list, "登录日志");
     }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysLogoConfigController.java

@@ -1,32 +1,23 @@
 package com.zd.system.controller;
 
-import java.util.List;
-import java.io.IOException;
-import java.util.Optional;
-import javax.servlet.http.HttpServletResponse;
-
-import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.utils.FileConfigUtils;
-import com.zd.common.swagger.config.Knife4jConfiguration;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.domain.ResultData;
 import com.zd.model.page.TableDataInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 import com.zd.system.domain.SysLogoConfig;
 import com.zd.system.service.ISysLogoConfigService;
-import com.zd.common.core.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * logo配置Controller
@@ -36,8 +27,6 @@ import io.swagger.annotations.ApiOperation;
  */
 @RestController
 @Api(tags = "【logo配置】")
-//作者手动加入 ，在接口上加作者@ApiOperationSupport(author = "XXX")
-@ApiSupport(author = Knife4jConfiguration.Author.CYL)
 @RequestMapping("/logo/config")
 public class SysLogoConfigController extends BaseController {
     @Autowired
@@ -64,7 +53,7 @@ public class SysLogoConfigController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysLogoConfig sysLogoConfig) throws IOException {
         List<SysLogoConfig> list = sysLogoConfigService.selectSysLogoConfigList(sysLogoConfig);
-        ExcelUtil<SysLogoConfig> util = new ExcelUtil<SysLogoConfig>(SysLogoConfig.class);
+        ExcelUtil<SysLogoConfig> util = new ExcelUtil<>(SysLogoConfig.class);
         util.exportExcel(response, list, "logo配置数据");
     }
 
@@ -116,7 +105,7 @@ public class SysLogoConfigController extends BaseController {
     @ApiOperation(value = "查询logo配置列表")
     public ResultData<SysLogoConfig> getLogoInfo(SysLogoConfig sysLogoConfig) {
         List<SysLogoConfig> list = sysLogoConfigService.selectSysLogoConfigList(sysLogoConfig);
-        if (list.size() > 0) {
+        if (list!=null && !list.isEmpty()) {
             SysLogoConfig logoConfig = list.get(0);
             return ResultData.success(logoConfig);
         }
@@ -131,7 +120,7 @@ public class SysLogoConfigController extends BaseController {
     @ApiOperation(value = "查询logo配置列表")
     public ResultData<SysLogoConfig> getConfInfo(SysLogoConfig sysLogoConfig) {
         List<SysLogoConfig> list = sysLogoConfigService.selectSysLogoConfigList(sysLogoConfig);
-        if (list.size() > 0) {
+        if (list!=null && !list.isEmpty()) {
             SysLogoConfig logoConfig = list.get(0);
             logoConfig.setCircularLogo(fileConfigUtils.getFileDomainAdmin() + Optional.ofNullable(logoConfig.getCircularLogo()).orElse(""));
             logoConfig.setRectangleLogo(fileConfigUtils.getFileDomainAdmin() + Optional.ofNullable(logoConfig.getRectangleLogo()).orElse(""));

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysMajorController.java

@@ -64,7 +64,7 @@ public class SysMajorController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysMajor sysMajor) throws IOException {
         List<SysMajor> list = sysMajorService.selectSysMajorList(sysMajor);
-        ExcelUtil<SysMajor> util = new ExcelUtil<SysMajor>(SysMajor.class);
+        ExcelUtil<SysMajor> util = new ExcelUtil<>(SysMajor.class);
         util.exportExcel(response, list, "major数据");
     }
 
@@ -114,7 +114,6 @@ public class SysMajorController extends BaseController {
     @GetMapping("/listPower")
     @ApiOperation(value = "查询major列表")
     public TableDataInfo<SysMajor> listPower(SysMajor sysMajor) {
-        //startPage();
         List<SysMajor> list = sysMajorService.selectSysMajorListPower(sysMajor);
         return getDataTable(list);
     }

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysMenuController.java

@@ -1,31 +1,22 @@
 package com.zd.system.controller;
 
-import java.util.List;
-
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.SecurityUtils;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.web.controller.BaseController;
 import com.zd.system.domain.SysMenu;
 import com.zd.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
-import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * 菜单信息

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysOperlogController.java

@@ -51,7 +51,7 @@ public class SysOperlogController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysOperLog operLog) throws IOException {
         List<SysOperLog> list = operLogService.selectOperLogList(operLog);
-        ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
+        ExcelUtil<SysOperLog> util = new ExcelUtil<>(SysOperLog.class);
         util.exportExcel(response, list, "操作日志");
     }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysPermitController.java

@@ -1,23 +1,20 @@
 package com.zd.system.controller;
 
-import com.zd.common.core.annotation.InnerAuth;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
-import com.zd.common.core.utils.ExcelUtil;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.page.TableDataInfo;
 import com.zd.system.domain.SysPermit;
-import com.zd.system.domain.SysPermitMenu;
 import com.zd.system.service.ISysPermitService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
 import java.util.List;
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysPostController.java

@@ -55,7 +55,7 @@ public class SysPostController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysPost post) throws IOException {
         List<SysPost> list = postService.selectPostList(post);
-        ExcelUtil<SysPost> util = new ExcelUtil<SysPost>(SysPost.class);
+        ExcelUtil<SysPost> util = new ExcelUtil<>(SysPost.class);
         util.exportExcel(response, list, "职位数据");
     }
 

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysRoleController.java

@@ -1,11 +1,11 @@
 package com.zd.system.controller;
 
 
-import com.zd.common.core.utils.ExcelUtil;
-import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.annotation.Log;
 import com.zd.common.core.annotation.PreAuthorize;
 import com.zd.common.core.log.BusinessType;
+import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.domain.AjaxResult;
@@ -20,10 +20,10 @@ import com.zd.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 角色信息
@@ -39,7 +39,6 @@ public class SysRoleController extends BaseController {
     @Autowired
     private ISysUserService userService;
 
-    //"system:role:list"
     @PreAuthorize(hasPermi = PerPrefix.SYSTEM_ROLE+ PerFun.LIST)
     @GetMapping("/list")
     public TableDataInfo list(SysRole role) {

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysStudentController.java

@@ -106,7 +106,7 @@ public class SysStudentController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.SYSTEM_USER_STUDENT+ PerFun.IMPORT)
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport,SysUserStudentByExcel sysUserStudentByExcel) throws Exception {
-        ExcelUtil<SysUserStudentByExcel> util = new ExcelUtil<SysUserStudentByExcel>(SysUserStudentByExcel.class);
+        ExcelUtil<SysUserStudentByExcel> util = new ExcelUtil<>(SysUserStudentByExcel.class);
         List<SysUserStudentByExcel> userList = util.importExcel(file.getInputStream(),true);
         String operName = SecurityUtils.getUsername();
         List<SysUserStudentByExcel> sysUserStudentByExcels = sysStudentService.importUserByStudent(userList, updateSupport, operName,sysUserStudentByExcel);
@@ -114,8 +114,8 @@ public class SysStudentController extends BaseController {
         resultMap.put("totalNum",userList.size());
         resultMap.put("successNum",userList.size()- sysUserStudentByExcels.size());
         resultMap.put("failureNum", sysUserStudentByExcels.size());
-        resultMap.put("downFile", sysUserStudentByExcels.size()>0?true:false);
-        if(sysUserStudentByExcels.size()>0){
+        resultMap.put("downFile", !sysUserStudentByExcels.isEmpty());
+        if(sysUserStudentByExcels!=null && !sysUserStudentByExcels.isEmpty()){
             redisService.setCacheObject("exportByStudent"+SecurityUtils.getUserId(), sysUserStudentByExcels, 1L, TimeUnit.HOURS);
         }
         return AjaxResult.success(resultMap);
@@ -133,9 +133,9 @@ public class SysStudentController extends BaseController {
                 "5、请注意：工号、联系电话是唯一的，不能重复，不可多条；工号限制最大7个字符，联系电话限制最大13个字符。\n" +
                 "6、请注意：出生日期填写为：YYYY-MM-DD。\n" +
                 "7、所在部门需填写系统中已录入的部门名称，否则无法正常导入。";
-        ExcelUtil<SysUserStudentByExcel> util = new ExcelUtil<SysUserStudentByExcel>(SysUserStudentByExcel.class);
+        ExcelUtil<SysUserStudentByExcel> util = new ExcelUtil<>(SysUserStudentByExcel.class);
         List<SysUserStudentByExcel> sysUserStudentByExcels = redisService.getCacheObject("exportByStudent"+SecurityUtils.getUserId());
-        if(sysUserStudentByExcels.size()>0){
+        if(sysUserStudentByExcels!=null && !sysUserStudentByExcels.isEmpty()){
             util.exportExcel(response, sysUserStudentByExcels, "未导入的用户数据", tips, "学生信息批量导入模板");
         }
     }
@@ -151,8 +151,7 @@ public class SysStudentController extends BaseController {
                 "5、请注意：工号、联系电话是唯一的，不能重复，不可多条；工号限制最大7个字符，联系电话限制最大13个字符。\n" +
                 "6、请注意：出生日期填写为：YYYY-MM-DD。\n" +
                 "7、所在部门需填写系统中已录入的部门名称，否则无法正常导入。";
-        ExcelUtil<SysUserStudentByExcel> util = new ExcelUtil<SysUserStudentByExcel>(SysUserStudentByExcel.class);
-//        util.importTemplateExcel(response, "用户数据");
+        ExcelUtil<SysUserStudentByExcel> util = new ExcelUtil<>(SysUserStudentByExcel.class);
         util.exportExcel(response, null, "学生信息批量导入模板", tips, "学生信息批量导入模板");
     }
 
@@ -186,8 +185,6 @@ public class SysStudentController extends BaseController {
             SysUser sysUser = sysStudentService.selectUserById(userId);
             if(StringUtils.isNotNull(sysUser.getCardNumSimple())){
                 try{
-//                    long num = Long.parseLong(sysUser.getCardNum(),16);
-//                    sysUser.setCardNum(num+"");
                     String num = DESUtils.decrypt(sysUser.getCardNumSimple());
                     sysUser.setCardNum(num);
                 }catch (Exception e){
@@ -221,7 +218,6 @@ public class SysStudentController extends BaseController {
         user.setCreateBy(SecurityUtils.getUsername());
         String password = configService.selectConfigByKey("sys.user.initPassword");
         user.setPassword(SecurityUtils.encryptPassword(password));
-        user.setPosition("4");
         return toAjax(sysStudentService.insertUser(user));
     }
 
@@ -244,14 +240,11 @@ public class SysStudentController extends BaseController {
             return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，账号已存在");
         }
         if(StringUtils.isNotEmpty(user.getCardNum())){
-//            Long carNum10 = Long.parseLong(user.getCardNum());
-//            String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
             String num = DESUtils.encrypt(user.getCardNum());
 
             SysUser sysUser= userService.selectUserInfoByCardNum(user.getUserId(),num);
             if(null!=sysUser){
                 return AjaxResult.error("卡号重复，请重新录入！");
-//                return AjaxResult.error(user.getCardNum()+"已与"+sysUser.getNickName()+"绑定,无法提交");
             }
         }
         user.setUpdateBy(SecurityUtils.getUsername());
@@ -354,7 +347,6 @@ public class SysStudentController extends BaseController {
     @InnerAuth
     @GetMapping("/all")
     public AjaxResult userALLIDS() {
-        Long userId = SecurityUtils.getUserId();
         SysUser user = new SysUser();
         user.setDelFlag(BaseConstants.NORMAL);
         user.setStatus(BaseConstants.NORMAL);

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysTeacherController.java

@@ -6,15 +6,12 @@ import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.redis.RedisService;
 import com.zd.common.core.utils.DESUtils;
 import com.zd.common.core.utils.ExcelUtil;
+import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.model.constant.BaseConstants;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.domain.AjaxResult;
-import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.model.entity.SysRole;
 import com.zd.model.entity.SysUser;
 import com.zd.model.page.TableDataInfo;
@@ -26,6 +23,7 @@ import com.zd.system.service.*;
 import com.zd.system.service.impl.TeacherServiceImpl;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -98,13 +96,12 @@ public class SysTeacherController extends BaseController {
         }
         user.setUserType(USER_TYPE);
         List<SysUser> list = sysTeacherService.selectUserList(user);
-//        teacherService.queryTeacherSuBCount(list);
 
         List<SysUserTeaCherByExport> teacherList = new ArrayList<>();
         for (SysUser sysUser : list) {
             teacherList.add(new SysUserTeaCherByExport(sysUser));
         }
-        ExcelUtil<SysUserTeaCherByExport> util = new ExcelUtil<SysUserTeaCherByExport>(SysUserTeaCherByExport.class);
+        ExcelUtil<SysUserTeaCherByExport> util = new ExcelUtil<>(SysUserTeaCherByExport.class);
         //本地日期,不包括时分秒
         LocalDate nowDate = LocalDate.now();
         util.exportExcel(response, teacherList, "用户数据", null, "教职工信息导出表"+nowDate);
@@ -115,7 +112,7 @@ public class SysTeacherController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.SYSTEM_USER_TEACHER+ PerFun.IMPORT)
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport, SysUserTeaCherByExcel sysUserTeaCherByExcel) throws Exception {
-        ExcelUtil<SysUserTeaCherByExcel> util = new ExcelUtil<SysUserTeaCherByExcel>(SysUserTeaCherByExcel.class);
+        ExcelUtil<SysUserTeaCherByExcel> util = new ExcelUtil<>(SysUserTeaCherByExcel.class);
         List<SysUserTeaCherByExcel> userList = util.importExcel(file.getInputStream(),true);
         String operName = SecurityUtils.getUsername();
         List<SysUserTeaCherByExcel> sysUserTeaCherByExcels = sysTeacherService.importUserByTeaCher(userList, updateSupport, operName, sysUserTeaCherByExcel);
@@ -123,8 +120,8 @@ public class SysTeacherController extends BaseController {
         resultMap.put("totalNum",userList.size());
         resultMap.put("successNum",userList.size()- sysUserTeaCherByExcels.size());
         resultMap.put("failureNum", sysUserTeaCherByExcels.size());
-        resultMap.put("downFile", sysUserTeaCherByExcels.size()>0?true:false);
-        if(sysUserTeaCherByExcels.size()>0){
+        resultMap.put("downFile", !sysUserTeaCherByExcels.isEmpty());
+        if(sysUserTeaCherByExcels!=null && !sysUserTeaCherByExcels.isEmpty()){
             redisService.setCacheObject("exportByTeaCher"+SecurityUtils.getUserId(), sysUserTeaCherByExcels, 1L, TimeUnit.HOURS);
         }
         return AjaxResult.success(resultMap);
@@ -142,9 +139,9 @@ public class SysTeacherController extends BaseController {
                 "5、请注意：工号、联系电话是唯一的，不能重复，不可多条；工号限制最大7个字符，联系电话限制最大13个字符。\n" +
                 "6、请注意：出生日期填写为：YYYY-MM-DD。\n" +
                 "7、所在部门需填写系统中已录入的部门名称，否则无法正常导入。";
-        ExcelUtil<SysUserTeaCherByExcel> util = new ExcelUtil<SysUserTeaCherByExcel>(SysUserTeaCherByExcel.class);
+        ExcelUtil<SysUserTeaCherByExcel> util = new ExcelUtil<>(SysUserTeaCherByExcel.class);
         List<SysUserTeaCherByExcel> sysUserTeaCherByExcels = redisService.getCacheObject("exportByTeaCher"+SecurityUtils.getUserId());
-        if(sysUserTeaCherByExcels.size()>0){
+        if(sysUserTeaCherByExcels!=null && !sysUserTeaCherByExcels.isEmpty()){
             util.exportExcel(response, sysUserTeaCherByExcels, "未导入的用户数据", tips, "教职工信息批量导入模板");
         }
     }
@@ -160,8 +157,7 @@ public class SysTeacherController extends BaseController {
                 "5、请注意：工号、联系电话是唯一的，不能重复，不可多条；工号限制最大7个字符，联系电话限制最大13个字符。\n" +
                 "6、请注意：出生日期填写为：YYYY-MM-DD。\n" +
                 "7、所在部门需填写系统中已录入的部门名称，否则无法正常导入。";
-        ExcelUtil<SysUserTeaCherByExcel> util = new ExcelUtil<SysUserTeaCherByExcel>(SysUserTeaCherByExcel.class);
-//        util.importTemplateExcel(response, "用户数据");
+        ExcelUtil<SysUserTeaCherByExcel> util = new ExcelUtil<>(SysUserTeaCherByExcel.class);
         util.exportExcel(response, null, "教职工信息批量导入模板", tips, "教职工信息批量导入模板");
     }
 
@@ -285,13 +281,11 @@ public class SysTeacherController extends BaseController {
         List<SysRole> roles = roleService.selectRoleAll();
         ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
         ajax.put("posts", postService.selectPostAll(new SysPost()));
-        if (StringUtils.isNotNull(userId)) {
+        if (userId != null) {
             SysUser sysUser = sysTeacherService.selectUserById(userId);
-            if(StringUtils.isNotNull(sysUser)){
+            if(sysUser != null){
                 if(StringUtils.isNotEmpty(sysUser.getCardNumSimple())){
                     try{
-//                        long num = Long.parseLong(sysUser.getCardNum(),16);
-//                        sysUser.setCardNum(num+"");
                         String num = DESUtils.decrypt(sysUser.getCardNumSimple());
                         sysUser.setCardNum(num);
                     }catch (Exception e){
@@ -299,7 +293,6 @@ public class SysTeacherController extends BaseController {
                     }
                 }
             }
-
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", roleService.selectRoleListByUserId(userId));

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserController.java

@@ -2,9 +2,6 @@ package com.zd.system.controller;
 
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
-import com.zd.laboratory.api.feign.RemoteLaboratoryService;
-import com.zd.model.domain.ResultData;
-import com.zd.model.entity.SysFile;
 import com.zd.base.api.feign.RemoteFileService;
 import com.zd.chemical.api.fegin.RemoteStockService;
 import com.zd.common.core.annotation.InnerAuth;
@@ -18,17 +15,16 @@ import com.zd.common.core.utils.SecurityUtils;
 import com.zd.common.core.utils.StringUtils;
 import com.zd.common.core.utils.file.ImageUtils;
 import com.zd.common.core.web.controller.BaseController;
+import com.zd.laboratory.api.feign.RemoteLaboratoryService;
 import com.zd.laboratory.api.feign.RemoteSubQueryService;
 import com.zd.model.constant.BaseConstants;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.R;
+import com.zd.model.domain.ResultData;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
-import com.zd.model.entity.LoginUser;
-import com.zd.model.entity.SysDept;
-import com.zd.model.entity.SysRole;
-import com.zd.model.entity.SysUser;
+import com.zd.model.entity.*;
 import com.zd.model.page.TableDataInfo;
 import com.zd.system.api.vo.SelectUserVO;
 import com.zd.system.api.vo.SimpleUserVO;
@@ -37,6 +33,8 @@ import com.zd.system.domain.SysPost;
 import com.zd.system.service.*;
 import io.swagger.annotations.*;
 import org.apache.commons.lang3.ArrayUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.validation.annotation.Validated;
@@ -63,6 +61,8 @@ import static com.zd.model.constant.BaseConstants.CODE_EXPIRATION;
 @RequestMapping("/user")
 @Api(tags = "用户管理")
 public class SysUserController extends BaseController {
+    private Logger logger = LoggerFactory.getLogger(SysUserController.class);
+
     @Autowired
     private ISysUserService userService;
 
@@ -76,9 +76,6 @@ public class SysUserController extends BaseController {
     private ISysPermissionService permissionService;
 
     @Autowired
-    private ISysConfigService configService;
-
-    @Autowired
     private RemoteSubQueryService subQueryService;
     @Autowired
     private ISysPermitMenuService sysPermitMenuService;
@@ -128,7 +125,7 @@ public class SysUserController extends BaseController {
     @PostMapping("/getUserDutyList")
     public TableDataInfo getUserDutyList(@RequestBody SysUser user) {
         startPage();
-        List<SysUser> list = new ArrayList<>();
+        List<SysUser> list ;
         user.setMajorId(Long.valueOf(user.getSubjectIds().size()+"") );
         if(user.getSubjectIds().size()==1){
             list = userService.selectUserDutyList(user);
@@ -136,31 +133,33 @@ public class SysUserController extends BaseController {
             list = userService.selectUserDutyListMultiple(user);
         }
 
-        for (SysUser su:list) {
-            //白名单集合
-            ResultData white= remoteLaboratoryService.getWhiteSubList(su.getUserId());
-            List<Long> subList = new ArrayList<>();
-            if(white.getCode()==200){
-                List<LinkedHashMap<String,Object>> linkedWhite = (List<LinkedHashMap<String, Object>>) white.getData();
-                for (int i=0;i<linkedWhite.size();i++){
-                    if(linkedWhite.get(i).get("subId")!=null){
-                        subList.add(Long.valueOf(linkedWhite.get(i).get("subId")+""));
-                    }
+        if(list!=null && !list.isEmpty()){
+            for (SysUser su:list) {
+                //白名单集合
+                ResultData white= remoteLaboratoryService.getWhiteSubList(su.getUserId());
+                List<Long> subList = new ArrayList<>();
+                if(white.getCode()==200){
+                    List<LinkedHashMap<String,Object>> linkedWhite = (List<LinkedHashMap<String, Object>>) white.getData();
+                    for (int i=0;i<linkedWhite.size();i++){
+                        if(linkedWhite.get(i).get("subId")!=null){
+                            subList.add(Long.valueOf(linkedWhite.get(i).get("subId")+""));
+                        }
 
-                }
-            }
-            //安全准入集合
-            ResultData apply=remoteLaboratoryService.getApplySubList(su.getUserId());
-            if(apply.getCode()==200){
-                List<LinkedHashMap<String,Object>> linkedWhite = (List<LinkedHashMap<String, Object>>) apply.getData();
-                for (int i=0;i<linkedWhite.size();i++){
-                    if(linkedWhite.get(i).get("subjectId")!=null){
-                        subList.add(Long.valueOf(linkedWhite.get(i).get("subjectId")+""));
                     }
+                }
+                //安全准入集合
+                ResultData apply=remoteLaboratoryService.getApplySubList(su.getUserId());
+                if(apply.getCode()==200){
+                    List<LinkedHashMap<String,Object>> linkedWhite = (List<LinkedHashMap<String, Object>>) apply.getData();
+                    for (int i=0;i<linkedWhite.size();i++){
+                        if(linkedWhite.get(i).get("subjectId")!=null){
+                            subList.add(Long.valueOf(linkedWhite.get(i).get("subjectId")+""));
+                        }
 
+                    }
                 }
+                su.setSubjectIds(subList);
             }
-            su.setSubjectIds(subList);
         }
 
         return getDataTable(list);
@@ -250,7 +249,7 @@ public class SysUserController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, SysUser user) throws IOException {
         List<SysUser> list = userService.selectUserList(user);
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
         util.exportExcel(response, list, "用户数据");
     }
 
@@ -259,7 +258,7 @@ public class SysUserController extends BaseController {
     @PreAuthorize(hasPermi = PerPrefix.SYSTEM_USER + PerFun.IMPORT)
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
         List<SysUser> userList = util.importExcel(file.getInputStream());
         String operName = SecurityUtils.getUsername();
         String message = userService.importUser(userList, updateSupport, operName);
@@ -268,7 +267,7 @@ public class SysUserController extends BaseController {
 
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) throws IOException {
-        ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+        ExcelUtil<SysUser> util = new ExcelUtil<>(SysUser.class);
         util.importTemplateExcel(response, "用户数据");
     }
 
@@ -289,11 +288,11 @@ public class SysUserController extends BaseController {
         LoginUser sysUserVo = new LoginUser();
         if (loginType != null && UserConstants.USER_LOGIN_HXP == loginType) {
             List<SysLogoConfig> list = sysLogoConfigService.selectSysLogoConfigList(new SysLogoConfig());
-            if (list.size() > 0 && list.get(0) != null) {
+            if (list!=null && !list.isEmpty()) {
                 if (sysUser.getUserType().equals(list.get(0).getUserType()) && "-1".equals(list.get(0).getUserType())) {
                     return R.fail("登录失败，没有使用权限！");
                 }
-                // TODO 校验是否有柜锁权限
+                // 校验是否有柜锁权限
                 Optional.ofNullable(list.get(0).getSmartLock()).ifPresent(a -> {
                     sysUserVo.setCabinetLock(a != null && a == 1 ? true : false);
                 });
@@ -305,20 +304,10 @@ public class SysUserController extends BaseController {
         }
 
         sysUserVo.setSysUser(sysUser);
-
-//        if(loginType != null && loginType == UserConstants.USER_LOGIN_PC){
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(sysUser);
         sysUserVo.setPermissions(permissions);
-
         sysUser.setPermits(sysPermitMenuService.selectPerMitByUserId(sysUser));
-
-        // 角色集合
-        //Set<String> roles = permissionService.getRolePermission(sysUser.getUserId());
-        //sysUserVo.setRoles(roles);
-//        }else {
-//            sysUser.setPermits(ListUtil.empty());
-//        }
         return R.ok(sysUserVo);
     }
 
@@ -576,7 +565,6 @@ public class SysUserController extends BaseController {
     @InnerAuth
     @GetMapping("/all")
     public AjaxResult userALLIDS() {
-        Long userId = SecurityUtils.getUserId();
         SysUser user = new SysUser();
         user.setDelFlag(BaseConstants.NORMAL);
         user.setStatus(BaseConstants.NORMAL);
@@ -700,7 +688,7 @@ public class SysUserController extends BaseController {
         try {
             return R.ok(ImageUtils.transparent(file.getInputStream(), 152));
         } catch (Exception e) {
-            e.printStackTrace();
+           logger.error("电子签名抠图生成图片异常："+e);
         }
         return R.fail("生成失败！");
     }
@@ -767,8 +755,8 @@ public class SysUserController extends BaseController {
         Long userId = SecurityUtils.getUserId();
         SysUser sysUser = userService.selectUserById(userId);
         SysDept sysDept = deptService.selectDeptById(sysUser.getDept().getDeptId());
-        Long deptId = "0".equals(sysDept.getAncestors()) == true ? sysDept.getDeptId() : Long.valueOf(sysDept.getAncestors().split(",")[1]);
-        return deptId;
+        return  "0".equals(sysDept.getAncestors()) ? sysDept.getDeptId() : Long.valueOf(sysDept.getAncestors().split(",")[1]);
+
     }
 
     /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/controller/SysUserOnlineController.java

@@ -1,30 +1,26 @@
 package com.zd.system.controller;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
+import com.zd.common.core.annotation.Log;
+import com.zd.common.core.annotation.PreAuthorize;
+import com.zd.common.core.log.BusinessType;
 import com.zd.common.core.redis.RedisService;
+import com.zd.common.core.utils.StringUtils;
+import com.zd.common.core.web.controller.BaseController;
 import com.zd.model.constant.CacheConstants;
 import com.zd.model.domain.AjaxResult;
 import com.zd.model.domain.per.PerFun;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.entity.LoginUser;
 import com.zd.model.page.TableDataInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.zd.common.core.utils.StringUtils;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.annotation.Log;
-import com.zd.common.core.annotation.PreAuthorize;
-import com.zd.common.core.log.BusinessType;
 import com.zd.system.domain.SysUserOnline;
 import com.zd.system.service.ISysUserOnlineService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * 在线用户监控
@@ -45,7 +41,7 @@ public class SysUserOnlineController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(String ipaddr, String userName) {
         Collection<String> keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*");
-        List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+        List<SysUserOnline> userOnlineList = new ArrayList<>();
         for (String key : keys) {
             LoginUser user = redisService.getCacheObject(key);
             if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {

zd-modules/zd-modules-system/src/main/java/com/zd/system/domain/SysMenu.java

@@ -95,7 +95,7 @@ public class SysMenu extends BaseEntity {
     /**
      * 子菜单
      */
-    private List<SysMenu> children = new ArrayList<SysMenu>();
+    private List<SysMenu> children = new ArrayList<>();
 
     public Long getMenuId() {
         return menuId;

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDeptManager.java

@@ -36,6 +36,11 @@ public class SysDeptManager {
     @Autowired
     RemoteLaboratoryService remoteLaboratoryService;
 
+    /***
+     * @deprecated
+     * @param dept
+     * @return
+     */
     //@DataScope(deptAlias = "d")
     @Deprecated
     public List<SysDeptListVO> querySysDeptListVO(SysDept dept) {

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDeptServiceImpl.java

@@ -1,29 +1,28 @@
 package com.zd.system.service.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
-
 import com.zd.common.core.annotation.DataScope;
+import com.zd.common.core.exception.ServiceException;
 import com.zd.common.core.security.TokenService;
 import com.zd.common.core.utils.Convert;
 import com.zd.common.core.utils.SecurityUtils;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.domain.per.PerPrefix;
 import com.zd.model.entity.SysDept;
 import com.zd.model.entity.SysRole;
 import com.zd.system.api.vo.SysDeptVO;
-import com.zd.system.domain.vo.TreeSelectVo;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.system.domain.vo.TreeSelect;
+import com.zd.system.domain.vo.TreeSelectVo;
 import com.zd.system.mapper.SysDeptMapper;
 import com.zd.system.mapper.SysRoleMapper;
 import com.zd.system.service.ISysDeptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.*;
+import java.util.stream.Collectors;
+
 /**
  * 部门管理 服务实现
  *
@@ -49,15 +48,13 @@ public class SysDeptServiceImpl implements ISysDeptService {
     @Override
     @DataScope(deptAlias = "d", permi = PerPrefix.SYSTEM_DEPT)
     public List<SysDept> selectDeptList(SysDept dept) {
-        List<SysDept> depts = deptMapper.selectDeptList(dept);
-        return depts;
+        return deptMapper.selectDeptList(dept);
     }
 
     @Override
     @DataScope(deptAlias = "d", permi = PerPrefix.SYSTEM_DEPT)
     public List <SysDept> treeDeptSubSel(SysDept dept) {
-        List<SysDept> depts = deptMapper.treeDeptSubSel(dept);
-        return depts;
+        return deptMapper.treeDeptSubSel(dept);
     }
 
     /**
@@ -74,8 +71,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
         }else{
             dept.setParentId(sysDept.getParentId());
         }
-        List<SysDept> depts = deptMapper.treeselectByUser(dept);
-        return depts;
+        return deptMapper.treeselectByUser(dept);
     }
 
 
@@ -286,7 +282,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
                         sysDept.setOrderNum(orderNum+"");
                         deptMapper.updateDept(sysDept);
                     }else{
-                        throw new ServiceException("已经移到最顶部了，不能再向下了！！");
+                        throw new ServiceException("已经移到最顶部了，不能再向上了！！");
                     }
                 }
 
@@ -361,8 +357,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
      */
     @Override
     public int updateDeptName(SysDept dept) {
-        int result = deptMapper.updateDept(dept);
-        return result;
+        return deptMapper.updateDept(dept);
     }
 
     /**
@@ -388,7 +383,7 @@ public class SysDeptServiceImpl implements ISysDeptService {
         for (SysDept child : children) {
             child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
         }
-        if (children.size() > 0) {
+        if (children!=null && !children.isEmpty()) {
             deptMapper.updateDeptChildren(children);
         }
     }
@@ -490,10 +485,10 @@ public class SysDeptServiceImpl implements ISysDeptService {
      * 得到子节点列表
      */
     private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
-        List<SysDept> tlist = new ArrayList<SysDept>();
+        List<SysDept> tlist = new ArrayList<>();
         Iterator<SysDept> it = list.iterator();
         while (it.hasNext()) {
-            SysDept n = (SysDept) it.next();
+            SysDept n = it.next();
             if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
                 tlist.add(n);
             }
@@ -505,6 +500,6 @@ public class SysDeptServiceImpl implements ISysDeptService {
      * 判断是否有子节点
      */
     private boolean hasChild(List<SysDept> list, SysDept t) {
-        return getChildList(list, t).size() > 0 ? true : false;
+        return !getChildList(list, t).isEmpty();
     }
 }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysDictTypeServiceImpl.java

@@ -75,7 +75,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
             DictUtils.setDictCache(dictType, dictDatas);
             return dictDatas;
         }
-        return null;
+        return dictDatas;
     }
 
     /**

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysLogoConfigServiceImpl.java

@@ -1,14 +1,13 @@
 package com.zd.system.service.impl;
 
-import java.util.List;
-
-import com.zd.common.core.utils.StringUtils;
 import com.zd.laboratory.api.feign.RemoteLaboratoryService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zd.system.mapper.SysLogoConfigMapper;
 import com.zd.system.domain.SysLogoConfig;
+import com.zd.system.mapper.SysLogoConfigMapper;
 import com.zd.system.service.ISysLogoConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * logo配置Service业务层处理
@@ -72,7 +71,7 @@ public class SysLogoConfigServiceImpl implements ISysLogoConfigService
     {
         int flag;
         List<SysLogoConfig> sysLogoConfigList = sysLogoConfigMapper.selectSysLogoConfigList(new SysLogoConfig());
-        if(sysLogoConfigList.size()>0){
+        if(sysLogoConfigList!=null && !sysLogoConfigList.isEmpty()){
             sysLogoConfig.setId(sysLogoConfigList.get(0).getId());
             flag = sysLogoConfigMapper.updateSysLogoConfig(sysLogoConfig);
         }else{

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysMenuServiceImpl.java

@@ -1,16 +1,11 @@
 package com.zd.system.service.impl;
 
-import java.util.*;
-import java.util.stream.Collectors;
+import com.zd.common.core.utils.SecurityUtils;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.model.constant.BaseConstants;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.entity.SysRole;
 import com.zd.model.entity.SysUser;
-import com.zd.system.mapper.SysUserMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.zd.common.core.utils.SecurityUtils;
-import com.zd.common.core.utils.StringUtils;
 import com.zd.system.domain.SysMenu;
 import com.zd.system.domain.vo.MetaVo;
 import com.zd.system.domain.vo.RouterVo;
@@ -18,7 +13,13 @@ import com.zd.system.domain.vo.TreeSelect;
 import com.zd.system.mapper.SysMenuMapper;
 import com.zd.system.mapper.SysRoleMapper;
 import com.zd.system.mapper.SysRoleMenuMapper;
+import com.zd.system.mapper.SysUserMapper;
 import com.zd.system.service.ISysMenuService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 菜单 业务层处理
@@ -27,7 +28,6 @@ import com.zd.system.service.ISysMenuService;
  */
 @Service
 public class SysMenuServiceImpl implements ISysMenuService {
-    public static final String PREMISSION_STRING = "perms[\"{0}\"]";
 
     @Autowired
     private SysMenuMapper menuMapper;
@@ -135,7 +135,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public List<RouterVo> buildMenus(List<SysMenu> menus) {
-        List<RouterVo> routers = new LinkedList<RouterVo>();
+        List<RouterVo> routers = new LinkedList<>();
         for (SysMenu menu : menus) {
             RouterVo router = new RouterVo();
             router.setHidden("1".equals(menu.getVisible()));
@@ -144,13 +144,13 @@ public class SysMenuServiceImpl implements ISysMenuService {
             router.setComponent(getComponent(menu));
             router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon(), StringUtils.equals("1", menu.getIsCache()), menu.getPath()));
             List<SysMenu> cMenus = menu.getChildren();
-            if (!cMenus.isEmpty() && cMenus.size() > 0 && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
+            if (cMenus!=null && !cMenus.isEmpty() && UserConstants.TYPE_DIR.equals(menu.getMenuType())) {
                 router.setAlwaysShow(true);
                 router.setRedirect("noRedirect");
                 router.setChildren(buildMenus(cMenus));
             } else if (isMenuFrame(menu)) {
                 router.setMeta(null);
-                List<RouterVo> childrenList = new ArrayList<RouterVo>();
+                List<RouterVo> childrenList = new ArrayList<>();
                 RouterVo children = new RouterVo();
                 children.setPath(menu.getPath());
                 children.setComponent(menu.getComponent());
@@ -161,7 +161,7 @@ public class SysMenuServiceImpl implements ISysMenuService {
             } else if (menu.getParentId().intValue() == 0 && isInnerLink(menu)) {
                 router.setMeta(new MetaVo(menu.getMenuName(), menu.getIcon()));
                 router.setPath("/inner");
-                List<RouterVo> childrenList = new ArrayList<RouterVo>();
+                List<RouterVo> childrenList = new ArrayList<>();
                 RouterVo children = new RouterVo();
                 String routerPath = StringUtils.replaceEach(menu.getPath(), new String[]{BaseConstants.HTTP, BaseConstants.HTTPS}, new String[]{"", ""});
                 children.setPath(routerPath);
@@ -184,13 +184,13 @@ public class SysMenuServiceImpl implements ISysMenuService {
      */
     @Override
     public List<SysMenu> buildMenuTree(List<SysMenu> menus) {
-        List<SysMenu> returnList = new ArrayList<SysMenu>();
-        List<Long> tempList = new ArrayList<Long>();
+        List<SysMenu> returnList = new ArrayList<>();
+        List<Long> tempList = new ArrayList<>();
         for (SysMenu dept : menus) {
             tempList.add(dept.getMenuId());
         }
         for (Iterator<SysMenu> iterator = menus.iterator(); iterator.hasNext(); ) {
-            SysMenu menu = (SysMenu) iterator.next();
+            SysMenu menu = iterator.next();
             // 如果是顶级节点, 遍历该父节点的所有子节点
             if (!tempList.contains(menu.getParentId())) {
                 recursionFn(menus, menu);
@@ -431,9 +431,9 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * @return String
      */
     public List<SysMenu> getChildPerms(List<SysMenu> list, int parentId) {
-        List<SysMenu> returnList = new ArrayList<SysMenu>();
+        List<SysMenu> returnList = new ArrayList<>();
         for (Iterator<SysMenu> iterator = list.iterator(); iterator.hasNext(); ) {
-            SysMenu t = (SysMenu) iterator.next();
+            SysMenu t = iterator.next();
             // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点
             if (t.getParentId() == parentId) {
                 recursionFn(list, t);
@@ -464,15 +464,14 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * 得到子节点列表
      */
     private List<SysMenu> getChildList(List<SysMenu> list, SysMenu t) {
-        List<SysMenu> tlist = new ArrayList<SysMenu>();
+        List<SysMenu> tlist = new ArrayList<>();
         Iterator<SysMenu> it = list.iterator();
         while (it.hasNext()) {
-            SysMenu n = (SysMenu) it.next();
+            SysMenu n = it.next();
             if (n.getParentId().longValue() == t.getMenuId().longValue()) {
                 tlist.add(n);
             }
         }
-        //tlist = tlist.stream().sorted(Comparator.comparing(SysMenu::getOrderNum)).collect(Collectors.toList());
         return tlist;
     }
 
@@ -480,6 +479,6 @@ public class SysMenuServiceImpl implements ISysMenuService {
      * 判断是否有子节点
      */
     private boolean hasChild(List<SysMenu> list, SysMenu t) {
-        return getChildList(list, t).size() > 0 ? true : false;
+        return !getChildList(list, t).isEmpty();
     }
 }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermissionServiceImpl.java

@@ -1,15 +1,15 @@
 package com.zd.system.service.impl;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import com.zd.model.constant.UserConstants;
 import com.zd.model.entity.SysUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import com.zd.system.service.ISysMenuService;
 import com.zd.system.service.ISysPermissionService;
 import com.zd.system.service.ISysRoleService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashSet;
+import java.util.Set;
 
 @Service
 public class SysPermissionServiceImpl implements ISysPermissionService {
@@ -27,7 +27,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
      */
     @Override
     public Set<String> getRolePermission(Long userId) {
-        Set<String> roles = new HashSet<String>();
+        Set<String> roles = new HashSet<>();
         // 管理员拥有所有权限
         if (SysUser.isAdmin(userId)) {
             roles.add("superAdmin");
@@ -45,18 +45,18 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
      */
     @Override
     public Set<String> getMenuPermission(SysUser sysUser) {
-        Set<String> perms = new HashSet<String>();
+        Set<String> perms = new HashSet<>();
         // 管理员拥有所有权限
         if (SysUser.isAdmin(sysUser.getUserId())) {
             perms.add("*:*:*");
         } else {
             if (UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())) {
-                // TODO 学生权限暂处理，项目拆分之后需要删除
+                    // 学生权限暂处理，项目拆分之后需要删除
                 perms.addAll(menuService.selectMenuByStudent());
             } else {
                 Set<String> data = menuService.selectNewMenuPermsByUserId(sysUser.getUserId());
 
-                if (data.size() == 0 && UserConstants.USER_TYPE_TEACHER.equals(sysUser.getUserType())) {
+                if (data!=null && data.isEmpty() && UserConstants.USER_TYPE_TEACHER.equals(sysUser.getUserType())) {
                     data = menuService.selectMenuByTeacher();
                 }
                 perms.addAll(data);

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysPermitMenuServiceImpl.java

@@ -1,21 +1,20 @@
 package com.zd.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.List;
-import com.zd.common.core.exception.PreAuthorizeException;
 import com.zd.common.core.exception.ServiceException;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.entity.SysPermitInfo;
 import com.zd.model.entity.SysUser;
+import com.zd.system.domain.SysPermitMenu;
 import com.zd.system.domain.SysPermitMenuDept;
 import com.zd.system.mapper.SysPermitMenuDeptMapper;
+import com.zd.system.mapper.SysPermitMenuMapper;
+import com.zd.system.service.ISysPermitMenuService;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.zd.system.mapper.SysPermitMenuMapper;
-import com.zd.system.domain.SysPermitMenu;
-import com.zd.system.service.ISysPermitMenuService;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 权限和菜单关联Service业务层处理
@@ -98,15 +97,15 @@ public class SysPermitMenuServiceImpl implements ISysPermitMenuService {
 
     @Override
     public List<SysPermitInfo> selectPerMitByUserId(SysUser sysUser) {
-        List<SysPermitInfo> list;
+        List<SysPermitInfo> list = new ArrayList<>();
         if (UserConstants.USER_TYPE_SUPPLIER.equals(sysUser.getUserType())) {
-            return null;
+            return list;
         } else if (UserConstants.USER_TYPE_STUDENT.equals(sysUser.getUserType())) {
             list = sysPermitMenuMapper.selectPerMitByStudent();
         } else {
             list = sysPermitMenuMapper.selectPerMitByUserId(sysUser.getUserId());
 
-            if (list.size() == 0 && UserConstants.USER_TYPE_TEACHER.equals(sysUser.getUserType())) {
+            if (list.isEmpty() && UserConstants.USER_TYPE_TEACHER.equals(sysUser.getUserType())) {
                 list = sysPermitMenuMapper.selectPerMitByTeacher();
             }
         }
@@ -166,7 +165,7 @@ public class SysPermitMenuServiceImpl implements ISysPermitMenuService {
         } else {
             throw new ServiceException("未知的源数据");
         }
-        if (permitMenuIds.size() > 0) {
+        if (permitMenuIds!=null && !permitMenuIds.isEmpty()) {
             sysPermitMenuDeptMapper.deleteSysPermitMenuDeptByPermitMenuIds(permitMenuIds.toArray(new Long[permitMenuIds.size()]));
         }
         if (CollectionUtils.isNotEmpty(permitMenus)) {
@@ -183,7 +182,7 @@ public class SysPermitMenuServiceImpl implements ISysPermitMenuService {
                     }
                 }
             }
-            if (permitMenuDeptList.size() > 0) {
+            if (permitMenuDeptList!=null && !permitMenuDeptList.isEmpty()) {
                 sysPermitMenuDeptMapper.insertBatch(permitMenuDeptList);
             }
         }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysRoleServiceImpl.java

@@ -2,11 +2,11 @@ package com.zd.system.service.impl;
 
 import com.zd.common.core.annotation.DataScope;
 import com.zd.common.core.exception.ServiceException;
-import com.zd.common.core.redis.RedisService;
-import com.zd.common.core.utils.*;
+import com.zd.common.core.utils.SecurityUtils;
+import com.zd.common.core.utils.SpringUtils;
+import com.zd.common.core.utils.StringUtils;
 import com.zd.model.constant.UserConstants;
 import com.zd.model.entity.SysRole;
-import com.zd.system.api.feign.RemoteUserService;
 import com.zd.system.domain.SysRoleDept;
 import com.zd.system.domain.SysRoleMenu;
 import com.zd.system.domain.SysUserRole;
@@ -40,11 +40,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
     @Autowired
     private SysDeptMapper deptMapper;
 
-    @Autowired
-    private RemoteUserService remoteUserService;
-
-    @Autowired
-    private RedisService redisService;
 
 
     /**
@@ -255,14 +250,14 @@ public class SysRoleServiceImpl implements ISysRoleService {
     public int insertRoleMenu(SysRole role) {
         int rows = 1;
         // 新增用户与角色管理
-        List<SysRoleMenu> list = new ArrayList<SysRoleMenu>();
+        List<SysRoleMenu> list = new ArrayList<>();
         for (Long menuId : role.getMenuIds()) {
             SysRoleMenu rm = new SysRoleMenu();
             rm.setRoleId(role.getRoleId());
             rm.setMenuId(menuId);
             list.add(rm);
         }
-        if (list.size() > 0) {
+        if (list!=null && !list.isEmpty()) {
             rows = roleMenuMapper.batchRoleMenu(list);
         }
         return rows;
@@ -276,14 +271,14 @@ public class SysRoleServiceImpl implements ISysRoleService {
     public int insertRoleDept(SysRole role) {
         int rows = 1;
         // 新增角色与部门（数据权限）管理
-        List<SysRoleDept> list = new ArrayList<SysRoleDept>();
+        List<SysRoleDept> list = new ArrayList<>();
         for (Long deptId : role.getDeptIds()) {
             SysRoleDept rd = new SysRoleDept();
             rd.setRoleId(role.getRoleId());
             rd.setDeptId(deptId);
             list.add(rd);
         }
-        if (list.size() > 0) {
+        if (list!=null && !list.isEmpty()) {
             rows = roleDeptMapper.batchRoleDept(list);
         }
         return rows;
@@ -361,7 +356,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
     @Override
     public int insertAuthUsers(Long roleId, Long[] userIds) {
         // 新增用户与角色管理
-        List<SysUserRole> list = new ArrayList<SysUserRole>();
+        List<SysUserRole> list = new ArrayList<>();
         for (Long userId : userIds) {
             SysUserRole ur = new SysUserRole();
             ur.setUserId(userId);
@@ -376,16 +371,6 @@ public class SysRoleServiceImpl implements ISysRoleService {
      */
     @Override
     public Map<String, Object> selectAuthUserPower(Long userId) {
-        // 1.0 需求
-        //userRoleMapper.selectAuthUserPower(SecurityUtils.getUserId());
-        //List<SysRole> role = roleMapper.selectRolePermissionByUserId(SecurityUtils.getUserId());
-
-        // 2.0 需求
-        //List<Map<String, Object>> map = deptMapper.selectLayoutOrderByUserId(SecurityUtils.getUserId());
-
-        // 2.4 需求 查询是校级1 还是院级 2
-        //Integer type = userId == 1 ? 1: userRoleMapper.selectLevelByUserId(userId);
-
         // 2.6 权限变更 属于校级权限，其他则院级权限 必须是教职工
         Integer type = deptMapper.selectLevelByUserId(userId) > 0 ? 1 : 2;
         Map<String, Object> data = new HashMap<>();

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysStudentServiceImpl.java

@@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -76,7 +75,6 @@ public class SysStudentServiceImpl implements ISysStudentService {
     private SysTeacherServiceImpl sysTeacherService;
 
 
-
     /**
      * 根据条件分页查询用户列表
      *
@@ -302,21 +300,9 @@ public class SysStudentServiceImpl implements ISysStudentService {
     @Override
     @Transactional
     public int insertUser(SysUser user) {
-//        //将10进制卡号转换至16进制
-//        if(StringUtils.isNotEmpty(user.getCardNum())){
-//            if(StringUtils.isNumeric(user.getCardNum())){
-//                Long carNum10 = Long.parseLong(user.getCardNum());
-//                String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
-//                user.setCardNum(carNum16);
-//            }else{
-//                throw new ServiceException("卡号只能是数字，不能包含字母！");
-//            }
-//
-//        }else{
-//            user.setCardNum(null);
-//        }
+        //将10进制卡号转换至16进制
         //处理卡号加密
-        sysTeacherService.passCardNum(user,1);
+        sysTeacherService.passCardNum(user, 1);
 
         // 新增用户信息
         int rows = userMapper.insertUser(user);
@@ -327,7 +313,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
             SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj), SysPermitMenu.class);
             newPermitMenus.add(sysPermitMenu);
         }
-        if (newPermitMenus.size() > 0) {
+        if (newPermitMenus != null && !newPermitMenus.isEmpty()) {
             // 插入最新用户绑定的权限数据
             sysPermitMenuService.insertSysPermitMenuList(null, user.getUserId(), newPermitMenus);
         }
@@ -369,17 +355,10 @@ public class SysStudentServiceImpl implements ISysStudentService {
         insertUserPost(user);
         try {
             //将10进制卡号转换至16进制
-            if(StringUtils.isNotEmpty(user.getCardNum())){
+            if (StringUtils.isNotEmpty(user.getCardNum())) {
                 //处理卡号加密
-                sysTeacherService.passCardNum(user,0);
-//                if(StringUtils.isNumeric(user.getCardNum())){
-//                    Long carNum10 = Long.parseLong(user.getCardNum());
-//                    String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
-//                    user.setCardNum(carNum16);
-//                }else{
-//                    throw new ServiceException("卡号只能是数字，不能包含字母！");
-//                }
-            }else{
+                sysTeacherService.passCardNum(user, 0);
+            } else {
                 user.setCardNum(null);
             }
             return userMapper.updateUser(user);
@@ -391,66 +370,50 @@ public class SysStudentServiceImpl implements ISysStudentService {
 
     /**
      * 修改用户信息，不进行权限配置
+     *
      * @param user
      * @return
      */
     @Override
     @Transactional(noRollbackFor = {NoRollException.class})
     public int update(SysUser user) {
-//        //将10进制卡号转换至16进制
-//        if(StringUtils.isNotEmpty(user.getCardNum())){
-//            if(StringUtils.isNumeric(user.getCardNum())){
-//                Long carNum10 = Long.parseLong(user.getCardNum());
-//                String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
-//                user.setCardNum(carNum16);
-//            }else{
-//                throw new ServiceException("卡号只能是数字，不能包含字母！");
-//            }
-//        }else{
-//            user.setCardNum(null);
-//        }
-
         //处理卡号加密
-        sysTeacherService.passCardNum(user,0);
+        sysTeacherService.passCardNum(user, 0);
         //处理Object 转换实体类
-        List <Object> permitMenus = user.getPermitMenus();
+        List<Object> permitMenus = user.getPermitMenus();
         List<SysPermitMenu> newPermitMenus = new ArrayList<>();
-        for(Object obj:permitMenus){
-            SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj),SysPermitMenu.class);
+        for (Object obj : permitMenus) {
+            SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj), SysPermitMenu.class);
             newPermitMenus.add(sysPermitMenu);
         }
-        if(newPermitMenus.size()>0){
+        if (newPermitMenus.size() > 0) {
             // 插入最新用户绑定的权限数据
-            sysPermitMenuService.insertSysPermitMenuList(null,user.getUserId(),newPermitMenus);
+            sysPermitMenuService.insertSysPermitMenuList(null, user.getUserId(), newPermitMenus);
         }
-
         SysUser oldUser = userMapper.selectUserById(user.getUserId());
-
         int count = userMapper.updateStudentUser(user);
-        if(user.getCardNumSimple() == null || !user.getCardNumSimple().equals(oldUser.getCardNumSimple())){
+        if (user.getCardNumSimple() == null || !user.getCardNumSimple().equals(oldUser.getCardNumSimple())) {
             remoteMessageContentService.updateUserCard(user);
         }
-
-
         return count;
     }
 
 
     /**
      * 修改用户信息，不进行权限配置
+     *
      * @param userList
      * @return
      */
     public int editUserByDept(List<SysUser> userList) {
         Optional.ofNullable(userList).orElseGet(Collections::emptyList).stream()
-                .forEach(a->{
+                .forEach(a -> {
                     userMapper.updateUser(a);
                 });
         return 1;
     }
 
 
-
     /**
      * 修改用户手机号
      *
@@ -462,7 +425,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
     public int changePhone(SysUser user) {
         try {
             return userMapper.updateUser(user);
-        }catch (DuplicateKeyException e){
+        } catch (DuplicateKeyException e) {
             throw new ServiceException("保存失败，请联系管理员！");
         }
 
@@ -547,14 +510,14 @@ public class SysStudentServiceImpl implements ISysStudentService {
         Long[] roles = user.getRoleIds();
         if (StringUtils.isNotNull(roles)) {
             // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            List<SysUserRole> list = new ArrayList<>();
             for (Long roleId : roles) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
-            if (list.size() > 0) {
+            if (list != null && !list.isEmpty()) {
                 userRoleMapper.batchUserRole(list);
             }
         }
@@ -569,14 +532,14 @@ public class SysStudentServiceImpl implements ISysStudentService {
         Long[] posts = user.getPostIds();
         if (StringUtils.isNotNull(posts)) {
             // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>();
+            List<SysUserPost> list = new ArrayList<>();
             for (Long postId : posts) {
                 SysUserPost up = new SysUserPost();
                 up.setUserId(user.getUserId());
                 up.setPostId(postId);
                 list.add(up);
             }
-            if (list.size() > 0) {
+            if (list != null && !list.isEmpty()) {
                 userPostMapper.batchUserPost(list);
             }
         }
@@ -591,14 +554,14 @@ public class SysStudentServiceImpl implements ISysStudentService {
     public void insertUserRole(Long userId, Long[] roleIds) {
         if (StringUtils.isNotNull(roleIds)) {
             // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            List<SysUserRole> list = new ArrayList<>();
             for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
-            if (list.size() > 0) {
+            if (list != null && !list.isEmpty()) {
                 userRoleMapper.batchUserRole(list);
             }
         }
@@ -649,7 +612,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
      */
     @Override
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList == null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -703,25 +666,24 @@ public class SysStudentServiceImpl implements ISysStudentService {
      */
     @Override
     public List<SysUserTeaCherByExcel> importUserByTeaCher(List<SysUserTeaCherByExcel> userList, Boolean isUpdateSupport, String operName, SysUserTeaCherByExcel sysUserTeaCherByExcel) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList == null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         List<SysUserTeaCherByExcel> failSysUserList = new ArrayList<>();
         String password = configService.selectConfigByKey("sys.user.initPassword");
         for (SysUserTeaCherByExcel user : userList) {
             //流水线验证
-            flowLineCheck(user,failSysUserList,password, sysUserTeaCherByExcel);
+            flowLineCheck(user, failSysUserList, password, sysUserTeaCherByExcel);
         }
         return failSysUserList;
     }
 
-    private void flowLineCheck(SysUserTeaCherByExcel user, List<SysUserTeaCherByExcel> failSysUserList, String password, SysUserTeaCherByExcel sysUserTeaCherByExcel){
+    private void flowLineCheck(SysUserTeaCherByExcel user, List<SysUserTeaCherByExcel> failSysUserList, String password, SysUserTeaCherByExcel sysUserTeaCherByExcel) {
         // 校验是否装入错误数据
         boolean checkBox = true;
-
         //验证必填字段是否为空
-        if(StringUtils.isEmpty(user.getNickName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getNickName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -729,8 +691,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("姓名不能为空,");
         }
 
-        if(StringUtils.isEmpty(user.getUserName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getUserName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -738,8 +700,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("工号不能为空,");
         }
 
-        if(StringUtils.isEmpty(user.getDeptName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getDeptName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -747,8 +709,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("所在部门不能为空,");
         }
 
-        if(StringUtils.isEmpty(user.getPistionName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getPistionName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -756,8 +718,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("身份不能为空,");
         }
 
-        if(StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())){
-            if(checkBox){
+        if (StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -769,8 +731,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
         // 验证是否存在这个用户
         SysUser checkUser = userMapper.selectUserByUserName(user.getUserName());
         if (StringUtils.isNotNull(user.getUserName()) && StringUtils.isNotNull(checkUser)) {
-            if(!sysUserTeaCherByExcel.getUpDate()){
-                if(checkBox){
+            if (!sysUserTeaCherByExcel.getUpDate()) {
+                if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
                     checkBox = false;
@@ -781,7 +743,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
         // 验证部门是否存在
         SysDept checkDept = deptMapper.getDeptNameUnique(user.getDeptName());
         if (StringUtils.isNotEmpty(user.getDeptName()) && StringUtils.isNull(checkDept)) {
-            if(checkBox){
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -790,20 +752,20 @@ public class SysStudentServiceImpl implements ISysStudentService {
         }
         //联系电话重复
         SysUser info = null;
-        if(StringUtils.isNotNull(checkUser) && sysUserTeaCherByExcel.getUpDate()){
-            if(StringUtils.isNotEmpty(user.getPhonenumber())){
+        if (StringUtils.isNotNull(checkUser) && sysUserTeaCherByExcel.getUpDate()) {
+            if (StringUtils.isNotEmpty(user.getPhonenumber())) {
                 SysUser userInfo = new SysUser();
                 userInfo.setUserName(checkUser.getUserName());
                 userInfo.setPhonenumber(user.getPhonenumber());
                 info = userMapper.checkPhoneUniqueNotOwn(userInfo);
             }
-        }else{
-            if(StringUtils.isNull(checkUser) && StringUtils.isNotEmpty(user.getPhonenumber())){
+        } else {
+            if (StringUtils.isNull(checkUser) && StringUtils.isNotEmpty(user.getPhonenumber())) {
                 info = userMapper.checkPhoneUnique(user.getPhonenumber());
             }
         }
-        if(StringUtils.isNotNull(info)){
-            if(checkBox){
+        if (StringUtils.isNotNull(info)) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -814,7 +776,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
         //身份是否存在
         SysPost sysPost = postMapper.checkPostNameUnique(user.getPistionName());
         if (StringUtils.isNotEmpty(user.getPistionName()) && StringUtils.isNull(sysPost)) {
-            if(checkBox){
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -822,14 +784,11 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("身份不存在,");
         }
         //日期格式转换
-        if(StringUtils.isNotNull(user.getDateBirth())){
+        if (StringUtils.isNotNull(user.getDateBirth())) {
             Date time = user.getDateBirth();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-            try{
+            try {
                 int year = time.getYear();
-                int month = time.getMonth();
-                int date = time.getDate();
-                if(year > new Date().getYear()-15) {
+                if (year > new Date().getYear() - 15) {
                     if (checkBox) {
                         user.getFailRemark().append("失败：");
                         failSysUserList.add(user);
@@ -837,7 +796,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
                     }
                     user.getFailRemark().append("出生日期异常最少应大于15岁,");
                 }
-            }catch (Exception e){
+            } catch (Exception e) {
                 if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
@@ -849,27 +808,27 @@ public class SysStudentServiceImpl implements ISysStudentService {
         }
 
         //插入正确数据
-        if(StringUtils.isEmpty(user.getFailRemark())){
+        if (StringUtils.isEmpty(user.getFailRemark())) {
             SysUser newSysUser = new SysUser();
             newSysUser.setNickName(user.getNickName());
             newSysUser.setUserName(user.getUserName());
             newSysUser.setDeptId(checkDept.getDeptId());
-            newSysUser.setPosition(sysPost.getPostId()+"");
+            newSysUser.setPosition(sysPost.getPostId() + "");
             newSysUser.setPhonenumber(user.getPhonenumber());
             newSysUser.setEmail(user.getEmail());
             newSysUser.setUserType("11");
             newSysUser.setSex(user.getSex());
             newSysUser.setDateBirth(user.getDateBirth());
             newSysUser.setCardNum(user.getCardNum());
-            if(!sysUserTeaCherByExcel.getSysUserEnable()){
-                newSysUser.setStatus(1+"");
+            if (!sysUserTeaCherByExcel.getSysUserEnable()) {
+                newSysUser.setStatus(1 + "");
             }
             newSysUser.setPassword(SecurityUtils.encryptPassword(password));
             newSysUser.setCreateBy(tokenService.getLoginUser().getNickName());
-            if(StringUtils.isNotNull(checkUser)){
+            if (StringUtils.isNotNull(checkUser)) {
                 newSysUser.setUserId(checkUser.getUserId());
                 this.updateUser(newSysUser);
-            }else{
+            } else {
                 this.insertUser(newSysUser);
             }
         }
@@ -885,34 +844,34 @@ public class SysStudentServiceImpl implements ISysStudentService {
      */
     @Override
     public List<SysUserStudentByExcel> importUserByStudent(List<SysUserStudentByExcel> userList, Boolean isUpdateSupport, String operName, SysUserStudentByExcel sysUserStudentByExcel) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList == null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         List<SysUserStudentByExcel> failSysUserList = new ArrayList<>();
         String password = configService.selectConfigByKey("sys.user.initPassword");
         for (SysUserStudentByExcel user : userList) {
             //流水线验证
-            flowLineCheckByStudent(user,failSysUserList,password, sysUserStudentByExcel);
+            flowLineCheckByStudent(user, failSysUserList, password, sysUserStudentByExcel);
         }
         return failSysUserList;
     }
 
 
-    private void flowLineCheckByStudent(SysUserStudentByExcel user, List<SysUserStudentByExcel> failSysUserList, String password, SysUserStudentByExcel sysUserStudentByExcel){
+    private void flowLineCheckByStudent(SysUserStudentByExcel user, List<SysUserStudentByExcel> failSysUserList, String password, SysUserStudentByExcel sysUserStudentByExcel) {
         // 校验是否装入错误数据
         Boolean checkBox = true;
 
         //验证必填字段是否为空
-        if(StringUtils.isEmpty(user.getNickName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getNickName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
             }
             user.getFailRemark().append("姓名不能为空、");
-        }else{
-            if(user.getNickName().length()>50){
-                if(checkBox){
+        } else {
+            if (user.getNickName().length() > 50) {
+                if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
                     checkBox = false;
@@ -921,16 +880,16 @@ public class SysStudentServiceImpl implements ISysStudentService {
             }
         }
 
-        if(StringUtils.isEmpty(user.getUserName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getUserName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
             }
             user.getFailRemark().append("学号不能为空、");
-        }else{
-            if(user.getUserName().length()>50){
-                if(checkBox){
+        } else {
+            if (user.getUserName().length() > 50) {
+                if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
                     checkBox = false;
@@ -939,8 +898,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             }
         }
 
-        if(StringUtils.isEmpty(user.getDeptName())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getDeptName())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -948,8 +907,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("所属学院不能为空、");
         }
 
-        if(StringUtils.isEmpty(user.getMajor())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getMajor())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -957,8 +916,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("专业不能为空、");
         }
 
-        if(StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())){
-            if(checkBox){
+        if (StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -966,13 +925,11 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("卡号只能为数字、");
         }
 
-        if(StringUtils.isNotEmpty(user.getCardNum())){
-//            Long carNum10 = Long.parseLong(user.getCardNum());
-//            String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
+        if (StringUtils.isNotEmpty(user.getCardNum())) {
             String desCardNum = DESUtils.encrypt(user.getCardNum());
             SysUser sysUser = userMapper.selectUserByCardNum(desCardNum);
-            if(StringUtils.isNotNull(sysUser)){
-                if(checkBox){
+            if (StringUtils.isNotNull(sysUser)) {
+                if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
                     checkBox = false;
@@ -984,8 +941,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
         // 验证是否存在这个用户
         SysUser checkUser = userMapper.selectUserByUserName(user.getUserName());
         if (StringUtils.isNotEmpty(user.getUserName()) && StringUtils.isNotNull(checkUser)) {
-            if(!sysUserStudentByExcel.getUpDate()){
-                if(checkBox){
+            if (!sysUserStudentByExcel.getUpDate()) {
+                if (checkBox) {
                     user.getFailRemark().append("失败：");
                     failSysUserList.add(user);
                     checkBox = false;
@@ -996,7 +953,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
         // 验证部门是否存在
         SysDept checkDept = deptMapper.getDeptNameUnique(user.getDeptName());
         if (StringUtils.isNotEmpty(user.getDeptName()) && StringUtils.isNull(checkDept)) {
-            if(checkBox){
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -1005,18 +962,18 @@ public class SysStudentServiceImpl implements ISysStudentService {
         }
         //联系电话重复
         SysUser info = null;
-        if(StringUtils.isNotNull(checkUser) && sysUserStudentByExcel.getUpDate()){
+        if (StringUtils.isNotNull(checkUser) && sysUserStudentByExcel.getUpDate()) {
             SysUser userInfo = new SysUser();
             userInfo.setUserName(checkUser.getUserName());
             userInfo.setPhonenumber(user.getPhonenumber());
             info = userMapper.checkPhoneUniqueNotOwn(userInfo);
-        }else{
-            if(StringUtils.isNotEmpty(user.getPhonenumber())){
+        } else {
+            if (StringUtils.isNotEmpty(user.getPhonenumber())) {
                 info = userMapper.checkPhoneUnique(user.getPhonenumber());
             }
         }
-        if(StringUtils.isNotNull(info)){
-            if(checkBox){
+        if (StringUtils.isNotNull(info)) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -1024,8 +981,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("联系电话重复、");
         }
 
-        if(StringUtils.isEmpty(user.getPhonenumber())){
-            if(checkBox){
+        if (StringUtils.isEmpty(user.getPhonenumber())) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -1033,8 +990,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("手机号码不能为空、");
         }
 
-        if(StringUtils.isNotEmpty(user.getPhonenumber()) && user.getPhonenumber().length()>11){
-            if(checkBox){
+        if (StringUtils.isNotEmpty(user.getPhonenumber()) && user.getPhonenumber().length() > 11) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -1046,8 +1003,8 @@ public class SysStudentServiceImpl implements ISysStudentService {
         SysMajor sysMajor = new SysMajor();
         sysMajor.setMajorName(user.getMajor());
         List<SysMajor> sysMajorList = sysMajorMapper.selectSysMajorList(sysMajor);
-        if (sysMajorList.size()==0) {
-            if(checkBox){
+        if (sysMajorList == null || sysMajorList.isEmpty()) {
+            if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
                 checkBox = false;
@@ -1055,15 +1012,12 @@ public class SysStudentServiceImpl implements ISysStudentService {
             user.getFailRemark().append("专业不存在、");
         }
         //日期格式转换
-        if(StringUtils.isNotNull(user.getDateBirth())){
+        if (StringUtils.isNotNull(user.getDateBirth())) {
             Date time = user.getDateBirth();
-            if(StringUtils.isNotNull(time)){
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
-                try{
+            if (StringUtils.isNotNull(time)) {
+                try {
                     int year = time.getYear();
-                    int month = time.getMonth();
-                    int date = time.getDate();
-                    if(year > new Date().getYear()-15) {
+                    if (year > new Date().getYear() - 15) {
                         if (checkBox) {
                             user.getFailRemark().append("失败：");
                             failSysUserList.add(user);
@@ -1071,7 +1025,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
                         }
                         user.getFailRemark().append("出生日期异常最少应大于15岁、");
                     }
-                }catch (Exception e){
+                } catch (Exception e) {
                     if (checkBox) {
                         user.getFailRemark().append("失败：");
                         failSysUserList.add(user);
@@ -1085,16 +1039,16 @@ public class SysStudentServiceImpl implements ISysStudentService {
 
         // 验证是否存在这个导师,如果通过名字查出两个或以上的，则不绑定老师
         List<SysUser> sysUserByTeacherList = userMapper.selectUserByNickName(user.getTutorUserName());
-        if(sysUserByTeacherList.size()==1){
+        if (sysUserByTeacherList.size() == 1) {
             user.setTutorUserId(sysUserByTeacherList.get(0).getUserId());
         }
 
-        if(StringUtils.isNotEmpty(user.getFailRemark())){
-            user.getFailRemark().deleteCharAt(user.getFailRemark().length()-1);
+        if (StringUtils.isNotEmpty(user.getFailRemark())) {
+            user.getFailRemark().deleteCharAt(user.getFailRemark().length() - 1);
         }
 
         //插入正确数据
-        if(StringUtils.isEmpty(user.getFailRemark())){
+        if (StringUtils.isEmpty(user.getFailRemark())) {
             SysUser newSysUser = new SysUser();
             newSysUser.setNickName(user.getNickName());
             newSysUser.setUserName(user.getUserName());
@@ -1106,18 +1060,18 @@ public class SysStudentServiceImpl implements ISysStudentService {
             newSysUser.setSex(user.getSex());
             newSysUser.setDateBirth(user.getDateBirth());
             newSysUser.setCardNum(user.getCardNum());
-            if(!sysUserStudentByExcel.getSysUserEnable()){
-                newSysUser.setStatus(1+"");
+            if (!sysUserStudentByExcel.getSysUserEnable()) {
+                newSysUser.setStatus(1 + "");
             }
             newSysUser.setPassword(SecurityUtils.encryptPassword(password));
             newSysUser.setCreateBy(tokenService.getLoginUser().getNickName());
-            if(StringUtils.isNotNull(user.getTutorUserId())){
-                newSysUser.setTutorUserId(Integer.parseInt(user.getTutorUserId()+""));
+            if (StringUtils.isNotNull(user.getTutorUserId())) {
+                newSysUser.setTutorUserId(Integer.parseInt(user.getTutorUserId() + ""));
             }
-            if(StringUtils.isNotNull(checkUser)){
+            if (StringUtils.isNotNull(checkUser)) {
                 newSysUser.setUserId(checkUser.getUserId());
                 this.updateUser(newSysUser);
-            }else{
+            } else {
                 this.insertUser(newSysUser);
             }
         }
@@ -1188,7 +1142,7 @@ public class SysStudentServiceImpl implements ISysStudentService {
     @Override
     public int bingUserByPosition(SysUser user) {
         Long[] userIds = user.getUserIds();
-        for(int i=0;i<userIds.length;i++){
+        for (int i = 0; i < userIds.length; i++) {
             user.setUserId(userIds[i]);
             userMapper.updateUser(user);
         }
@@ -1205,11 +1159,11 @@ public class SysStudentServiceImpl implements ISysStudentService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int relieveUserByPosition(SysUser user) {
-        if(user.getUserId()!=null){
+        if (user.getUserId() != null) {
             userMapper.relieveUserByPosition(user);
-        }else{
+        } else {
             Long[] userIds = user.getUserIds();
-            for(int i=0;i<userIds.length;i++) {
+            for (int i = 0; i < userIds.length; i++) {
                 user.setUserId(userIds[i]);
                 userMapper.relieveUserByPosition(user);
             }

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysTeacherServiceImpl.java

@@ -282,21 +282,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int insertUser(SysUser user) {
-//        //将10进制卡号转换至16进制
-//        if(StringUtils.isNotEmpty(user.getCardNum())){
-//            if(StringUtils.isNumeric(user.getCardNum())){
-//                Long carNum10 = Long.parseLong(user.getCardNum());
-//                String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
-//                user.setCardNum(carNum16);
-//            }else{
-//                throw new ServiceException("卡号只能是数字，不能包含字母！");
-//            }
-//
-//        }else{
-//            user.setCardNum(null);
-//        }
-
-
+        //将10进制卡号转换至16进制
         //处理卡号加密
         passCardNum(user,1);
         // 新增用户信息
@@ -308,7 +294,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
             SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj),SysPermitMenu.class);
             newPermitMenus.add(sysPermitMenu);
         }
-        if(newPermitMenus.size()>0){
+        if(newPermitMenus!=null && !newPermitMenus.isEmpty()){
             // 插入最新用户绑定的权限数据
             sysPermitMenuService.insertSysPermitMenuList(null,user.getUserId(),newPermitMenus);
         }
@@ -353,13 +339,6 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
             if(StringUtils.isNotEmpty(user.getCardNum())){
                 //处理卡号加密
                 passCardNum(user,0);
-//                if(StringUtils.isNumeric(user.getCardNum())){
-//                    Long carNum10 = Long.parseLong(user.getCardNum());
-//                    String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
-//                    user.setCardNum(carNum16);
-//                }else{
-//                    throw new ServiceException("卡号只能是数字，不能包含字母！");
-//                }
             }else{
                 user.setCardNum(null);
             }
@@ -399,7 +378,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
             SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj),SysPermitMenu.class);
             newPermitMenus.add(sysPermitMenu);
         }
-        if(newPermitMenus.size()>0){
+        if(newPermitMenus!=null && !newPermitMenus.isEmpty()){
             // 插入最新用户绑定的权限数据
             sysPermitMenuService.insertSysPermitMenuList(null,user.getUserId(),newPermitMenus);
         }
@@ -426,6 +405,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
      * @param userList
      * @return
      */
+    @Override
     public int editUserByDept(List<SysUser> userList) {
         Optional.ofNullable(userList).orElseGet(Collections::emptyList).stream()
                 .forEach(a->{
@@ -439,7 +419,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
     public Map <String, Object> updateCardNum(List <SysUser> userList) {
         LongAdder count = new LongAdder();
         String[] cardNums = new String[userList.size()];
-        //todo 将所有的卡号转换成加密后的卡号
+        //将所有的卡号转换成加密后的卡号
         Optional.ofNullable(userList).orElseGet(Collections::emptyList)
                 .stream()
                 .forEach(a->{
@@ -448,7 +428,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
                     cardNums[count.intValue()] = a.getCardNumSimple();
                     count.increment();
                 });
-        //todo 将所有的加密后卡号，查询校验是否有除自己以外的卡号重复
+        //将所有的加密后卡号，查询校验是否有除自己以外的卡号重复
         List<SysUser> resutUserList = userMapper.queryCardNumByIds(cardNums);
 
         List<String> repeatList = new ArrayList <>();
@@ -467,11 +447,11 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
                 });
 
         Map<String,Object> allMap = new HashMap <>();
-        if(repeatList.size()>0){
+        if(repeatList!=null && !repeatList.isEmpty()){
             allMap.put("repeatCard",-1);
             allMap.put("repeatList",repeatList);
         }else{
-            //todo 批量修改卡号
+            //批量修改卡号
             Optional.ofNullable(userList).orElseGet(Collections::emptyList)
                     .stream()
                     .forEach(a->{
@@ -587,7 +567,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
-            if (list.size() > 0) {
+            if (list!=null && !list.isEmpty()) {
                 userRoleMapper.batchUserRole(list);
             }
         }
@@ -602,14 +582,14 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
         Long[] posts = user.getPostIds();
         if (StringUtils.isNotNull(posts)) {
             // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>();
+            List<SysUserPost> list = new ArrayList<>();
             for (Long postId : posts) {
                 SysUserPost up = new SysUserPost();
                 up.setUserId(user.getUserId());
                 up.setPostId(postId);
                 list.add(up);
             }
-            if (list.size() > 0) {
+            if (list!=null && !list.isEmpty()) {
                 userPostMapper.batchUserPost(list);
             }
         }
@@ -624,14 +604,14 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
     public void insertUserRole(Long userId, Long[] roleIds) {
         if (StringUtils.isNotNull(roleIds)) {
             // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            List<SysUserRole> list = new ArrayList<>();
             for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
-            if (list.size() > 0) {
+            if (list!=null && !list.isEmpty()) {
                 userRoleMapper.batchUserRole(list);
             }
         }
@@ -682,7 +662,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
      */
     @Override
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList==null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -736,7 +716,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
      */
     @Override
     public List<SysUserTeaCherByExcel> importUserByTeaCher(List<SysUserTeaCherByExcel> userList, Boolean isUpdateSupport, String operName, SysUserTeaCherByExcel sysUserTeaCherByExcel) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList==null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         List<SysUserTeaCherByExcel> failSysUserList = new ArrayList<>();
@@ -807,18 +787,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
             user.getFailRemark().append("身份不能为空、");
         }
 
-//        if(StringUtils.isNotEmpty(user.getCardNum()) && !StringUtils.isNumeric(user.getCardNum())){
-//            if(checkBox){
-//                user.getFailRemark().append("失败：");
-//                failSysUserList.add(user);
-//                checkBox = false;
-//            }
-//            user.getFailRemark().append("卡号只能为数字、");
-//        }
-
         if(StringUtils.isNotEmpty(user.getCardNum())){
-//            Long carNum10 = Long.parseLong(user.getCardNum());
-//            String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
             String desCardNum = DESUtils.encrypt(user.getCardNum());
             SysUser sysUser = userMapper.selectUserByCardNum(desCardNum);
             if(StringUtils.isNotNull(sysUser)){
@@ -908,11 +877,8 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
         //日期格式转换
         if(StringUtils.isNotNull(user.getDateBirth())){
             Date time = user.getDateBirth();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             try{
                 int year = time.getYear();
-                int month = time.getMonth();
-                int date = time.getDate();
                 if(year > new Date().getYear()-15) {
                     if (checkBox) {
                         user.getFailRemark().append("失败：");
@@ -973,7 +939,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
      */
     @Override
     public List<SysUserStudentByExcel> importUserByStudent(List<SysUserStudentByExcel> userList, Boolean isUpdateSupport, String operName, SysUserStudentByExcel sysUserStudentByExcel) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList==null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         List<SysUserStudentByExcel> failSysUserList = new ArrayList<>();
@@ -1083,7 +1049,7 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
         SysMajor sysMajor = new SysMajor();
         sysMajor.setMajorName(user.getMajor());
         List<SysMajor> sysMajorList = sysMajorMapper.selectSysMajorList(sysMajor);
-        if (sysMajorList.size()==0) {
+        if (sysMajorList==null || sysMajorList.isEmpty()) {
             if(checkBox){
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
@@ -1095,11 +1061,8 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
         if(StringUtils.isNotNull(user.getDateBirth())){
             Date time = user.getDateBirth();
             if(StringUtils.isNotNull(time)){
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 try{
                     int year = time.getYear();
-                    int month = time.getMonth();
-                    int date = time.getDate();
                     if(year > new Date().getYear()-15) {
                         if (checkBox) {
                             user.getFailRemark().append("失败：");

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysUrlConfigServiceImpl.java

@@ -42,7 +42,7 @@ public class SysUrlConfigServiceImpl implements SysUrlConfigService {
     @Override
     public SysUrlConfig queryByPage(SysUrlConfig sysUrlConfig) {
         List<SysUrlConfig> list = sysUrlConfigDao.queryAll(sysUrlConfig);
-        if(list.size() > 0){
+        if(list!=null && !list.isEmpty()){
             return list.get(0);
         }
         return new SysUrlConfig();

zd-modules/zd-modules-system/src/main/java/com/zd/system/service/impl/SysUserServiceImpl.java

@@ -24,7 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.text.SimpleDateFormat;
+
 import java.util.*;
 
 /**
@@ -287,7 +287,7 @@ public class SysUserServiceImpl implements ISysUserService {
         if (StringUtils.isNotEmpty(user.getCardNum())) {
             if (StringUtils.isNumeric(user.getCardNum())) {
                 Long carNum10 = Long.parseLong(user.getCardNum());
-                String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
+                String carNum16 = Long.toHexString(carNum10).toUpperCase();
                 user.setCardNum(carNum16);
             } else {
                 throw new ServiceException("卡号只能是数字，不能包含字母！");
@@ -304,7 +304,7 @@ public class SysUserServiceImpl implements ISysUserService {
             SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj),SysPermitMenu.class);
             newPermitMenus.add(sysPermitMenu);
         }
-        if(newPermitMenus.size()>0){
+        if(newPermitMenus!=null && !newPermitMenus.isEmpty()){
             // 插入最新用户绑定的权限数据
             sysPermitMenuService.insertSysPermitMenuList(null,user.getUserId(),newPermitMenus);
         }
@@ -350,7 +350,7 @@ public class SysUserServiceImpl implements ISysUserService {
             if(StringUtils.isNotEmpty(user.getCardNum())){
                 if(StringUtils.isNumeric(user.getCardNum())){
                     Long carNum10 = Long.parseLong(user.getCardNum());
-                    String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
+                    String carNum16 = Long.toHexString(carNum10).toUpperCase();
                     user.setCardNum(carNum16);
                 }else{
                     throw new ServiceException("卡号只能是数字，不能包含字母！");
@@ -376,7 +376,7 @@ public class SysUserServiceImpl implements ISysUserService {
         if(StringUtils.isNotEmpty(user.getCardNum())){
             if(StringUtils.isNumeric(user.getCardNum())){
                 Long carNum10 = Long.parseLong(user.getCardNum());
-                String carNum16 = carNum10.toHexString(carNum10).toUpperCase();
+                String carNum16 = Long.toHexString(carNum10).toUpperCase();
                 user.setCardNum(carNum16);
             }else{
                 throw new ServiceException("卡号只能是数字，不能包含字母！");
@@ -391,7 +391,7 @@ public class SysUserServiceImpl implements ISysUserService {
             SysPermitMenu sysPermitMenu = JSONArray.parseObject(JSONArray.toJSONString(obj),SysPermitMenu.class);
             newPermitMenus.add(sysPermitMenu);
         }
-        if(newPermitMenus.size()>0){
+        if(newPermitMenus!=null && !newPermitMenus.isEmpty()){
             // 插入最新用户绑定的权限数据
             sysPermitMenuService.insertSysPermitMenuList(null,user.getUserId(),newPermitMenus);
         }
@@ -510,14 +510,14 @@ public class SysUserServiceImpl implements ISysUserService {
         Long[] roles = user.getRoleIds();
         if (StringUtils.isNotNull(roles)) {
             // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            List<SysUserRole> list = new ArrayList<>();
             for (Long roleId : roles) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(user.getUserId());
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
-            if (list.size() > 0) {
+            if (list!=null && !list.isEmpty()) {
                 userRoleMapper.batchUserRole(list);
             }
         }
@@ -532,14 +532,14 @@ public class SysUserServiceImpl implements ISysUserService {
         Long[] posts = user.getPostIds();
         if (StringUtils.isNotNull(posts)) {
             // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>();
+            List<SysUserPost> list = new ArrayList<>();
             for (Long postId : posts) {
                 SysUserPost up = new SysUserPost();
                 up.setUserId(user.getUserId());
                 up.setPostId(postId);
                 list.add(up);
             }
-            if (list.size() > 0) {
+            if (!list.isEmpty()) {
                 userPostMapper.batchUserPost(list);
             }
         }
@@ -554,14 +554,14 @@ public class SysUserServiceImpl implements ISysUserService {
     public void insertUserRole(Long userId, Long[] roleIds) {
         if (StringUtils.isNotNull(roleIds)) {
             // 新增用户与角色管理
-            List<SysUserRole> list = new ArrayList<SysUserRole>();
+            List<SysUserRole> list = new ArrayList<>();
             for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
                 list.add(ur);
             }
-            if (list.size() > 0) {
+            if (!list.isEmpty()) {
                 userRoleMapper.batchUserRole(list);
             }
         }
@@ -612,7 +612,7 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList==null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -666,7 +666,7 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public List<SysUserTeaCherByExcel> importUserByTeaCher(List<SysUserTeaCherByExcel> userList, Boolean isUpdateSupport, String operName, SysUserTeaCherByExcel sysUserTeaCherByExcel) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList==null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         List<SysUserTeaCherByExcel> failSysUserList = new ArrayList<>();
@@ -784,11 +784,8 @@ public class SysUserServiceImpl implements ISysUserService {
         //日期格式转换
         if (StringUtils.isNotNull(user.getDateBirth())) {
             Date time = user.getDateBirth();
-            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
             try {
                 int year = time.getYear();
-                int month = time.getMonth();
-                int date = time.getDate();
                 if (year > new Date().getYear() - 15) {
                     if (checkBox) {
                         user.getFailRemark().append("失败：");
@@ -844,7 +841,7 @@ public class SysUserServiceImpl implements ISysUserService {
      */
     @Override
     public List<SysUserStudentByExcel> importUserByStudent(List<SysUserStudentByExcel> userList, Boolean isUpdateSupport, String operName, SysUserStudentByExcel sysUserStudentByExcel) {
-        if (StringUtils.isNull(userList) || userList.size() == 0) {
+        if (userList==null || userList.isEmpty()) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         List<SysUserStudentByExcel> failSysUserList = new ArrayList<>();
@@ -953,7 +950,7 @@ public class SysUserServiceImpl implements ISysUserService {
         SysMajor sysMajor = new SysMajor();
         sysMajor.setMajorName(user.getMajor());
         List<SysMajor> sysMajorList = sysMajorMapper.selectSysMajorList(sysMajor);
-        if (sysMajorList.size() == 0) {
+        if (sysMajorList==null || sysMajorList.isEmpty()) {
             if (checkBox) {
                 user.getFailRemark().append("失败：");
                 failSysUserList.add(user);
@@ -965,11 +962,8 @@ public class SysUserServiceImpl implements ISysUserService {
         if (StringUtils.isNotNull(user.getDateBirth())) {
             Date time = user.getDateBirth();
             if (StringUtils.isNotNull(time)) {
-                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
                 try {
                     int year = time.getYear();
-                    int month = time.getMonth();
-                    int date = time.getDate();
                     if (year > new Date().getYear() - 15) {
                         if (checkBox) {
                             user.getFailRemark().append("失败：");
@@ -1049,7 +1043,6 @@ public class SysUserServiceImpl implements ISysUserService {
      * @return
      */
     @Override
-    @DataScope(deptAlias = "d", userAlias = "u")
     public List<SysUser> selectUserListByName(SysUser sysUser) {
         return userMapper.selectUserListByName(sysUser);
     }