删除用户

src/main/java/com/fdkankan/sale/aop/VisitLogInterceptor.java

@@ -84,6 +84,9 @@ public class VisitLogInterceptor {
 				msg = "操作成功";
 			}
 		}
+		if(!StpUtil.isLogin()){
+			return result;
+		}
 		//获取用户信息 如果已登录，从token中获取用户信息，如果是登录接口，查询数据库获取用户信息
 		Long userId =null;
 		String userName =null;

src/main/java/com/fdkankan/sale/service/impl/SysUserServiceImpl.java

@@ -210,18 +210,24 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
     @Override
     public void delUser(Long id) {
         List<RepairLog> list = repairLogService.getBySysUserId(id);
-        Integer maxStatus = null;
+        HashMap<String,Integer> statusMap = new HashMap<>();
         for (RepairLog repairLog : list) {
-            if(maxStatus == null || repairLog.getRepairStatus() > maxStatus){
-                maxStatus = repairLog.getRepairStatus();
+            if(statusMap.get(repairLog.getRepairId()) == null){
+                statusMap.put(repairLog.getRepairId(),repairLog.getRepairStatus());
+            }else {
+                Integer status = statusMap.get(repairLog.getRepairId());
+                if(repairLog.getRepairStatus() > status ){
+                    statusMap.put(repairLog.getRepairId(),repairLog.getRepairStatus());
+                }
             }
         }
-        if(maxStatus == null || maxStatus >=11 ){
-            this.removeById(id);
-            return;
+        for (Integer maxStatus : statusMap.values()) {
+            if(maxStatus != null &&  maxStatus <11 ){
+                throw new BusinessException(ResultCode.DEL_USER_REPAIR);
+            }
         }
-        throw new BusinessException(ResultCode.DEL_USER_REPAIR);
 
+        this.removeById(id);
     }
 
     @Override