【CHG】修改查询数据权限

railway-business/src/main/java/com/railway/business/catenary/util/JcebQueryUtil.java

@@ -25,13 +25,17 @@ import org.apache.commons.collections4.CollectionUtils;
 public class JcebQueryUtil {
 
   private static JcebQueryParamVo getJcebQuery(String submitState){
+    JcebQueryParamVo jcebQuery = new JcebQueryParamVo();
+    jcebQuery.setSubmitState(submitState);
     SysUser user = SecurityUtils.getLoginUser().getUser();
+    if(JcebStatusEnum.UNREPORTED.getCode().equals(submitState)){
+      jcebQuery.setCreateBy(user.getUserName());
+    }else {
+      jcebQuery.setCreateBy(null);
+    }
     // 管理员全部数据
-    JcebQueryParamVo jcebQuery = new JcebQueryParamVo();
     if(user.isAdmin()){
-      log.debug("^_^ 管理员设置为查询已提交表 ^_^");
-      jcebQuery.setSubmitState(JcebStatusEnum.REPORTED.getCode());
-      jcebQuery.setCreateBy(null);
+      log.debug("^_^ 管理员设置为查询所有 ^_^");
       jcebQuery.setPostType(PostTypeEnum.CENTER.getCode());
       return jcebQuery;
     }
@@ -53,19 +57,16 @@ public class JcebQueryUtil {
     if(PostTypeEnum.CENTER == postType) {
       log.debug("^_^ 车间领导设置为查询已提交表 ^_^");
       jcebQuery.setDeptId(getDeptIdCache(user.getUserId()));
-      jcebQuery.setSubmitState(JcebStatusEnum.REPORTED.getCode());
       jcebQuery.setPostType(PostTypeEnum.CENTER.getCode());
-      jcebQuery.setCreateBy(null);
     }else if(PostTypeEnum.LEADER == postType || scope.equals(DataScopeAspect.DATA_SCOPE_DEPT)
         || scope.equals(DataScopeAspect.DATA_SCOPE_DEPT_AND_CHILD)){
+      log.debug("^_^ 中心领导根据选择的车间查询 ^_^");
       jcebQuery.setDeptId(user.getDeptId());
-      jcebQuery.setSubmitState(JcebStatusEnum.REPORTED.getCode());
       jcebQuery.setPostType(PostTypeEnum.LEADER.getCode());
-      jcebQuery.setCreateBy(null);
     }else {
+      log.debug("^_^ 车间职工只能查看自己的 ^_^");
       jcebQuery.setCreateBy(user.getUserName());
       jcebQuery.setPostType(PostTypeEnum.STAFF.getCode());
-      jcebQuery.setSubmitState(submitState);
     }
     return jcebQuery;
   }