仓库报表

platform-rest/src/main/java/com/platform/rest/controller/upms/SysUserController.java

@@ -79,7 +79,7 @@ public class SysUserController {
     public R userInfo(@RequestHeader(value = HttpHeaders.AUTHORIZATION, required = false) String authHeader) {
         OauthUser user = SecurityUtils.getUser();
         String username = user.getUsername();
-        // 获取客户端
+//         获取客户端
         String clientId = SecurityUtils.getClientId();
         AssertUtils.notNull(clientId);
         UserInfoVO userInfoVO = sysUserService.selectUserInfo(username);

platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -258,10 +258,13 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                 noticeNumberVO.setTimeOutTaskNum(overTimeCount==null?new BigDecimal(0):overTimeCount);
                 noticeNumberVO=addCheckJobNums(noticeNumberVO,checkJobVOS);
             }
-            if(sb.toString().contains(CommonConstants.WORKPLACE_STORE_MANAGE)){
+            if(sb.toString().contains(CommonConstants.WORKPLACE_STORE_MANAGE) &&!sb.toString().contains(CommonConstants.WORKPLACE_REPAIR_MANAGE) && !sb.toString().contains(SysRoleCodeEnum.REPAIR_MANAGE.name()) ){
                 //仓库管理员
                 //仓库
                 //入库
+                inStoreFormDTO.setUserId(userInfo.getUserId());
+                outStoreFormDTO.setUserId(userInfo.getUserId());
+                storeCheckJobDTO.setUserId(userInfo.getUserId());
                 noticeNumberVO.setRoleFlag(4);
                 noticeNumberVO=addStoreNums(noticeNumberVO,inStoreFormDTO,outStoreFormDTO,storeCheckJobDTO);
             }
@@ -436,10 +439,12 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
             }
         }
         int count=0;
-        repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
-        repairApplicationFormVO.setRoleFlag(roleFlag);
-        count=mapper.getRepairCount1(repairApplicationFormDTO);
-        repairApplicationFormVO.setRepairCount(count);
+        if(repairApplicationFormVO!=null){
+            repairApplicationFormVO=mapper.getFirstRepairApplicationFormVO(repairApplicationFormDTO);
+            repairApplicationFormVO.setRoleFlag(roleFlag);
+            count=mapper.getRepairCount1(repairApplicationFormDTO);
+            repairApplicationFormVO.setRepairCount(count);
+        }
         return repairApplicationFormVO;