首页待办数据

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/TodoService.java

@@ -80,20 +80,6 @@ public class TodoService {
                 ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
     }
 
-    /**
-     * @param todoRequest 角色编码
-     * @description 通过角色来设置id值
-     * @date 2020/4/25 10:01 上午
-     */
-    private void handleTodoRequest(TodoRequest todoRequest) {
-        if (CommonEnum.DefaultRole.REGION_DIRECTOR.getCode().equals(todoRequest.getCurrentRoleCode())) {
-            todoRequest.setRegionChargeId(todoRequest.getUserId());
-        }
-        if(CommonEnum.DefaultRole.MTWORK.getCode().equals(todoRequest.getCurrentRoleCode())) {
-            todoRequest.setClerkId(todoRequest.getUserId().toString());
-        }
-    }
-
     /**
      * @param
      * @return
@@ -101,6 +87,7 @@ public class TodoService {
      * @date 2020/2/14 12:20 下午
      */
     public RestResponse getEmergencyTodo(TodoRequest todoRequest) {
+        handleTodoRequest(todoRequest);
         List<EmergencyResponse> emergencyTodoResponseList = todoDataMapper.getEmergencyTodoData(todoRequest);
         return RestResponse.success(emergencyTodoResponseList, ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
     }
@@ -112,6 +99,7 @@ public class TodoService {
      * @date 2020/2/14 12:21 下午
      */
     public RestResponse getMaintenanceTodo(TodoRequest todoRequest) {
+        handleTodoRequest(todoRequest);
         List<MaintenanceTodoResponse> maintenanceTodoResponseList = todoDataMapper.getMaintenanceTodoData(todoRequest);
         return RestResponse.success(maintenanceTodoResponseList, ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
     }
@@ -123,6 +111,7 @@ public class TodoService {
      * @date 2020/2/14 12:22 下午
      */
     public RestResponse getCapitalRepairTodo(TodoRequest todoRequest) {
+        handleTodoRequest(todoRequest);
         List<CapitalRepairResponse> capitalRepairResponseList = todoDataMapper.getCapitalRepairTodoData(todoRequest);
         return RestResponse.success(capitalRepairResponseList, ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
     }
@@ -134,6 +123,7 @@ public class TodoService {
      * @date 2020/2/14 12:24 下午
      */
     public RestResponse getAnnualInspectionTodo(TodoRequest todoRequest) {
+        handleTodoRequest(todoRequest);
         List<AnnualInspectionResponse> annualInspectionResponseList = todoDataMapper
                 .getAnnualInspectionTodoData(todoRequest);
         return RestResponse.success(annualInspectionResponseList, ApiConstants.RESULT_SUCCESS, "获取待办数据成功");
@@ -182,6 +172,20 @@ public class TodoService {
         }
     }
 
+    /**
+     * @param todoRequest 角色编码
+     * @description 通过角色来设置id值
+     * @date 2020/4/25 10:01 上午
+     */
+    private void handleTodoRequest(TodoRequest todoRequest) {
+        if (CommonEnum.DefaultRole.REGION_DIRECTOR.getCode().equals(todoRequest.getCurrentRoleCode())) {
+            todoRequest.setRegionChargeId(todoRequest.getUserId());
+        }
+        if(CommonEnum.DefaultRole.CLERK.getCode().equals(todoRequest.getCurrentRoleCode())) {
+            todoRequest.setClerkId(todoRequest.getUserId().toString());
+        }
+    }
+
     /**
      * @param
      * @return

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -353,8 +353,12 @@ public class LoginService implements ILoginService {
         //从redis中获取用户信息
         String mobileUserInfo = (String) redisTemplate.opsForValue().get(userResponse.getToken());
         Map<String, Object> userInfoMap = JSONUtil.parseObj(redisTemplate.opsForValue().get(mobileUserInfo));
-        //设置用户角色id
-        userInfoMap.put(ApiConstants.CURRENT_ROLE_ID, userResponse.getRole().getId());
+        if (userResponse.getRole() != null) {
+            //设置用户角色id
+            userInfoMap.put(ApiConstants.CURRENT_ROLE_ID, userResponse.getRole().getId());
+            //设置角色编码信息
+            userInfoMap.put(ApiConstants.CURRENT_ROLE_CODE, userResponse.getRole().getCode());
+        }
         //设置用户公司id
         userInfoMap.put(ApiConstants.CURRENT_COMPANY_ID, userResponse.getMaintenanceCompany().getId());
         //设置用户菜单信息

lift-system-service/src/main/resources/mapper/TodoDataMapper.xml

@@ -31,7 +31,7 @@
         where
             cr.mt_company_id = #{mtCompanyId}
         and
-            cr.projectStatus <![CDATA[ != ]]> 4
+            cr.project_status <![CDATA[ != ]]> 4
     </sql>
 
     <!-- 年检记录查询条件sql -->
@@ -49,7 +49,7 @@
             select id from region r
             where true
             <if test="clerkId != null">
-                and r.cleck find_in_set(#{clerkId}, r.clerk)
+                and find_in_set(#{clerkId}, r.clerk)
             </if>
             <if test="regionChargeId != null">
                 and r.user_id = #{regionChargeId}
@@ -284,7 +284,7 @@
         select
             count(1)
         from
-            capital_repair cr
+            capital_repair p
         <include refid="capitalTodoQuerySql"/>
         <include refid="regionProjectSql"/>
     </select>