修改bug

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

@@ -1,11 +1,7 @@
 package com.xunmei.system.controller;
 
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
 import com.xunmei.system.api.domain.SysArea;
-import com.xunmei.system.domain.SysNfcBind;
 import com.xunmei.system.service.ISysAreaService;
 import com.xunmei.system.service.ISysNfcBindService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +22,6 @@ import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 /**

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

@@ -1,14 +1,10 @@
 package com.xunmei.system.controller;
 
 import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-
 import com.xunmei.system.api.domain.SysArea;
 import com.xunmei.system.domain.SysAreaCheck;
 import com.xunmei.system.service.ISysAreaCheckService;
 import com.xunmei.system.service.ISysAreaService;
-import com.xunmei.system.service.ISysOrgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,7 +23,6 @@ import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
 
 /**

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

@@ -212,8 +212,7 @@ public class SysRoleController extends BaseController {
     @InnerAuth
     @GetMapping(value = "/getRoleById")
     public SysRole getRoleById(Long id) {
-        SysRole sysRole = roleService.getById(id);
-        return sysRole;
+        return roleService.getById(id);
     }
 
 //    @InnerAuth

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysAreaCheckServiceImpl.java

@@ -3,9 +3,9 @@ package com.xunmei.system.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.utils.bean.BeanUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.system.api.domain.SysArea;
@@ -18,9 +18,6 @@ import com.xunmei.system.mapper.SysOrgMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.xunmei.system.service.ISysOrgService;
-
-import java.util.Arrays;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -178,7 +175,7 @@ public class SysAreaCheckServiceImpl extends ServiceImpl<SysAreaCheckMapper, Sys
         query.eq("del_flag", "0");
         query.in("check_id", ids);
         List<SysNfcBind> sysNfcBinds = sysNfcBindMapper.selectList(query);
-        if (null == sysNfcBinds || sysNfcBinds.size() > 0) {
+        if(CollectionUtils.isNotEmpty(sysNfcBinds)){
             throw new ServiceException("数据使用中，不能删除");
         }
         int i = 0;

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysAreaServiceImpl.java

@@ -1,12 +1,6 @@
 package com.xunmei.system.service.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
-
-import com.alibaba.nacos.shaded.org.checkerframework.checker.units.qual.A;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.xunmei.common.core.exception.ServiceException;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.SecurityUtils;
@@ -18,11 +12,7 @@ import com.xunmei.system.mapper.SysAreaCheckMapper;
 import com.xunmei.system.mapper.SysDictDataMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.xunmei.system.service.ISysOrgService;
-
-import java.util.Arrays;
 import java.util.stream.Collectors;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -62,8 +52,8 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
         //查询条件
         QueryWrapper<SysArea> query = new QueryWrapper<>(sysArea);
         //下穿
-        if (sysArea.getCheckSub()) {
-            //  List<Long> ids = orgService.selectCheckSubOrgIdList(sysArea.getOrgType());
+        Boolean checkSub = sysArea.getCheckSub();
+        if (checkSub) {
             List<SysDictData> sysDictData = sysDictDataMapper.selectDictDataByType(sysArea.getOrgType());
             List<String> ids = sysDictData.stream().map(e -> e.getDictValue()).collect(Collectors.toList());
             //清空前端传递的org_id
@@ -155,9 +145,8 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
         SysAreaCheck sysAreaCheck = new SysAreaCheck();
         QueryWrapper<SysAreaCheck> query = new QueryWrapper<>(sysAreaCheck);
         query.eq("del_flag", "0");
-        List<SysAreaCheck> sysAreaChecks = new ArrayList<>();
         query.in("area_id", ids);
-        sysAreaChecks = sysAreaCheckMapper.selectList(query);
+        List<SysAreaCheck> sysAreaChecks = sysAreaCheckMapper.selectList(query);
         if (null == sysAreaChecks || sysAreaChecks.size() > 0) {
             throw new ServiceException("数据使用中，不能删除");
         }
@@ -186,9 +175,8 @@ public class SysAreaServiceImpl extends ServiceImpl<ISysAreaMapper, SysArea> imp
         SysAreaCheck sysAreaCheck = new SysAreaCheck();
         QueryWrapper<SysAreaCheck> query = new QueryWrapper<>(sysAreaCheck);
         query.eq("del_flag", "0");
-        List<SysAreaCheck> sysAreaChecks = new ArrayList<>();
         query.eq("area_id", id);
-        sysAreaChecks = sysAreaCheckMapper.selectList(query);
+        List<SysAreaCheck> sysAreaChecks = sysAreaCheckMapper.selectList(query);
         if (null == sysAreaChecks || sysAreaChecks.size() > 0) {
             throw new ServiceException("数据使用中，不能删除");
         }