feats

src/main/java/com/example/civilizedcity/common/BaseController.java

@@ -58,6 +58,11 @@ public class BaseController {
         return taPerson;
     }
 
+    public String getPersonDuty() throws Exception {
+        String duty = request.getHeader("x-duty");
+        return StringUtils.isEmpty(duty) ? null : duty;
+    }
+
     public boolean isManager(SysUser sysUser) throws Exception {
         if (Constants.ROOT_ORG.equals(sysUser.getOrgId())) return true;
 

src/main/java/com/example/civilizedcity/controller/TaIssueApplyController.java

@@ -55,6 +55,21 @@ public class TaIssueApplyController extends BaseController {
         return ResponseBean.success(taIssueApplyService.getById(id));
     }
 
+    private String getOrgId() throws Exception {
+        SysUser sysUser = currentUser();
+        String orgId = isManager(sysUser) ? null : sysUser.getOrgId();
+        String duty = getPersonDuty();
+
+        if (StringUtils.isNotEmpty((duty))) {
+            if (Constants.DUTY_ORG_MANAGER.equals(duty) || Constants.DUTY_ORG_USER.equals(duty)) {
+                if (StringUtils.isEmpty(orgId)) {
+                    orgId = sysUser.getOrgId();
+                }
+            }
+        }
+
+        return orgId;
+    }
 
     /**
      * 获取申请条数
@@ -67,13 +82,11 @@ public class TaIssueApplyController extends BaseController {
     public ResponseBean countApply(@ApiParam("申请状态") @RequestParam(value = "state", defaultValue = "0") Integer state,
                                    @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType) throws Exception {
 
-        SysUser sysUser = currentUser();
-        boolean isManager = isManager(sysUser);
-        long num = 0;
+        String orgId = getOrgId();
 
         QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(StringUtils.isNotEmpty(applyType), "apply_type", applyType);
-        queryWrapper.eq(!isManager, "org_id", sysUser.getOrgId());
+        queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
 
         if (0 == state) {
             queryWrapper.isNull("verify_date");
@@ -81,7 +94,7 @@ public class TaIssueApplyController extends BaseController {
             queryWrapper.isNotNull("verify_date");
         }
 
-        num = taIssueApplyService.count(queryWrapper);
+        long num = taIssueApplyService.count(queryWrapper);
 
         return ResponseBean.success(num);
     }
@@ -98,15 +111,12 @@ public class TaIssueApplyController extends BaseController {
     public ResponseBean queryByIssueId(@ApiParam("问题单ID") @PathVariable Integer issueId,
                                        @ApiParam("申请类型") @RequestParam("applyType") String applyType) throws Exception {
 
-        SysUser sysUser = currentUser();
-        boolean isManager = isManager(sysUser);
+        String orgId = getOrgId();
 
         QueryWrapper<TaIssueApply> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("issue_id", issueId);
         queryWrapper.eq("apply_type", applyType);
-        if (!isManager) {
-            queryWrapper.eq("org_id", sysUser.getOrgId());
-        }
+        queryWrapper.eq(StringUtils.isNotEmpty(orgId), "org_id", orgId);
         queryWrapper.gt("status", Constants.STATUS_DELETE);
         queryWrapper.orderByDesc("create_date");
         queryWrapper.last("limit 1");
@@ -130,19 +140,9 @@ public class TaIssueApplyController extends BaseController {
                              @ApiParam("问题单ID") @RequestParam(value = "issueId", required = false) Integer issueId,
                              @ApiParam("申请类型") @RequestParam(value = "applyType", required = false) String applyType,
                              @ApiParam("问题单来源") @RequestParam(value = "sourceType", required = false) String sourceType,
-                             @ApiParam("用户身份") @RequestParam(value = "duty", required = false) String duty,
                              @ApiParam(value = "是否全部") @RequestParam(value = "isAll", defaultValue = "false") Boolean isAll) throws Exception {
 
-        SysUser sysUser = currentUser();
-        String orgId = isManager(sysUser) ? null : sysUser.getOrgId();
-
-        if (StringUtils.isNotEmpty((duty))) {
-            if (Constants.DUTY_ORG_MANAGER.equals(duty) || Constants.DUTY_ORG_USER.equals(duty)) {
-                if (StringUtils.isEmpty(orgId)) {
-                    orgId = sysUser.getOrgId();
-                }
-            }
-        }
+        String orgId = getOrgId();
 
         IPage<TaIssueApply> pg = new Page<>(pageNum, pageSize);
         IPage<TaIssueApply> result = taIssueApplyService.getPageBy(pg, issueId, applyType, orgId, sourceType, isAll);