隐患检查

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/controller/CheckRecordController.java

@@ -29,10 +29,6 @@ import com.customs.cq.datacenter.business.service.CheckRecordService;
 import com.customs.cq.datacenter.common.ExecutedResult;
 import com.customs.cq.datacenter.common.PagerResult;
 import com.customs.cq.datacenter.common.core.controller.BasicController;
-import com.customs.cq.datacenter.common.core.domain.model.LoginUser;
-import com.customs.cq.datacenter.common.enums.EResultCode;
-import com.customs.cq.datacenter.common.exception.ServiceException;
-import com.customs.cq.datacenter.common.helper.LoginHelper;
 import com.customs.cq.datacenter.common.model.ReqListId;
 import com.customs.cq.datacenter.common.validator.ParameterValidateResult;
 import com.customs.cq.datacenter.common.validator.ParameterValidator;
@@ -40,7 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * 2010.隐患检查记录
@@ -102,7 +97,7 @@ public class CheckRecordController extends BasicController {
      */
     @PostMapping(value = "search")
     public ExecutedResult<PagerResult<CheckRecordVO>> search(@RequestBody SearchCheckRecord request) {
-        return this.service.search(request, Boolean.FALSE);
+        return this.service.search(request, null);
     }
 
     /**
@@ -111,12 +106,6 @@ public class CheckRecordController extends BasicController {
      */
     @PostMapping(value = "listMine")
     public ExecutedResult<PagerResult<CheckRecordVO>> listMine(@RequestBody SearchCheckRecord request) {
-        LoginUser loginUser = LoginHelper.getLoginUser();
-        if (Objects.isNull(loginUser)) {
-            throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
-        }
-        // 指定用户查询
-        request.setCheckPerson(loginUser.getUserId().toString());
         return this.service.search(request, Boolean.FALSE);
     }
 

secure-producting-business/src/main/java/com/customs/cq/datacenter/business/service/CheckRecordService.java

@@ -221,22 +221,39 @@ public class CheckRecordService extends BasicService {
         return ExecutedResult.success(result);
     }
 
-    public ExecutedResult<PagerResult<CheckRecordVO>> search(SearchCheckRecord search, boolean isGridAdmin) {
+    public ExecutedResult<PagerResult<CheckRecordVO>> search(SearchCheckRecord search, Boolean isGridAdmin) {
         List<CheckRecordVO> listVo = new ArrayList<>();
 
-        if (isGridAdmin) {
-            LoginUser loginUser = LoginHelper.getLoginUser();
-            if (Objects.isNull(loginUser)) {
-                throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
-            }
-            // 获取用户
-            SysUser user = userMapper.selectUserById(Long.parseLong(loginUser.getLoginId()));
-            // 获取当前登录用户是网格管理员的网格id
-            List<Long> listGrid = gridPersonMapper.listGrid4AdminUser(user.getUserGuid());
-            if (ListUtil.isNullOrEmpty(listGrid)) {
-                return ExecutedResult.success(new PagerResult<>(search.getLimit(), search.getPage(), 0L, listVo));
+        if (Objects.nonNull(isGridAdmin)) {
+            if (isGridAdmin) {
+                LoginUser loginUser = LoginHelper.getLoginUser();
+                if (Objects.isNull(loginUser)) {
+                    throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
+                }
+                // 获取用户
+                SysUser user = userMapper.selectById(loginUser.getUserId());
+                // 获取当前登录用户是网格管理员的网格列表
+                List<Long> listGrid = gridPersonMapper.listGrid4AdminUser(user.getUserGuid());
+                if (ListUtil.isNullOrEmpty(listGrid)) {
+                    return ExecutedResult.success(new PagerResult<>(search.getLimit(), search.getPage(), 0L, listVo));
+                }
+                // 设置查询的网格范围
+                search.setListGridId(listGrid);
+            } else {
+                LoginUser loginUser = LoginHelper.getLoginUser();
+                if (Objects.isNull(loginUser)) {
+                    throw new ServiceException("尚未登陆.", EResultCode.UNAUTHORIZED.getCode());
+                }
+                // 获取用户
+                SysUser user = userMapper.selectById(loginUser.getUserId());
+                // 获取当前登录用户所属网格列表
+                List<Long> listGrid = gridPersonMapper.listGrid4User(user.getUserGuid());
+                if (ListUtil.isNullOrEmpty(listGrid)) {
+                    return ExecutedResult.success(new PagerResult<>(search.getLimit(), search.getPage(), 0L, listVo));
+                }
+                // 设置查询的网格范围
+                search.setListGridId(listGrid);
             }
-            search.setListGridId(listGrid);
         }
         // 处理创建时间范围-查询参数
         Tuple<String, String> createTimeRange = ParameterUtil.getTimeRange(search.getCreateTimeRange());

secure-producting-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -6,6 +6,7 @@
 
     <resultMap type="SysUser" id="SysUserResult">
         <id property="userId" column="user_id"/>
+        <result property="userGuid" column="user_guid"/>
         <result property="deptId" column="dept_id"/>
         <result property="userName" column="user_name"/>
         <result property="nickName" column="nick_name"/>

secure-producting-vue/src/views/grid/components/MyGridAndCheck.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-card shadow="hover" header="今日隐患检查" style="margin-bottom: 5px">
-      <el-table :data="listMineGrid" stripe style="width: 100%" empty-text="当期帐号没有网格归属，请联系管理员！">
+      <el-table :data="listMineGrid" stripe style="width: 100%" empty-text="当前帐号没有网格归属，请联系管理员！">
         <el-table-column prop="checkFormName" label="检查表信息" :show-overflow-tooltip="true">
           <template #default="scope">
             {{ scope.row.gridName + ' - ' + scope.row.checkFormName }}