【CHG】检测表区分领导和职工

railway-admin/src/main/java/com/railway/web/controller/business/catenary/BusJcebController.java

@@ -10,7 +10,10 @@ import com.railway.business.catenary.service.IBusJcebLbjghjlService;
 import com.railway.business.catenary.service.IBusJcebQmjcjlService;
 import com.railway.business.catenary.service.IBusJcebXsjcjlService;
 import com.railway.common.core.controller.BaseController;
+import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.core.page.TableDataInfo;
+import com.railway.common.utils.SecurityUtils;
+import com.railway.system.enums.PostTypeEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import java.util.ArrayList;
@@ -56,6 +59,13 @@ public class BusJcebController extends BaseController {
   @GetMapping(value = "listByType")
   public TableDataInfo listByType(JcebQueryVo query) {
     startPage();
+    SysUser user = SecurityUtils.getLoginUser().getUser();
+    PostTypeEnum postType = PostTypeEnum.ofValue(user.getPost());
+    if(postType == PostTypeEnum.STAFF){
+      query.setOperator(user.getUserId());
+    }else {
+      query.setOperator(null);
+    }
 
     JcebTypeEnum jcebTypeEnum = JcebTypeEnum.ofValue(query.getJcebType());
     List<JcebRecordVo> list = null;

railway-business/src/main/java/com/railway/business/catenary/domain/vo/JcebQueryVo.java

@@ -27,5 +27,5 @@ public class JcebQueryVo implements Serializable {
   private String pillarCode;
 
   @ApiModelProperty(value = "记录人/操作人")
-  private String operator;
+  private Long operator;
 }

railway-business/src/main/java/com/railway/business/catenary/service/impl/BusJcebServiceImpl.java

@@ -7,6 +7,7 @@ import com.railway.business.catenary.domain.vo.JcebRecordVo;
 import com.railway.business.catenary.enums.JcebStatusEnum;
 import com.railway.business.catenary.mapper.BusJcebMapper;
 import com.railway.business.catenary.service.IBusJcebService;
+import com.railway.common.core.domain.entity.SysUser;
 import com.railway.common.utils.SecurityUtils;
 import java.util.Date;
 import java.util.List;

railway-system/src/main/java/com/railway/system/enums/PostTypeEnum.java

@@ -0,0 +1,41 @@
+package com.railway.system.enums;
+
+/**
+ * 岗位
+ *
+ * @author zhaomn
+ */
+public enum PostTypeEnum {
+
+  /** 岗位 */
+  LEADER("leader", "领导"),
+  STAFF("staff", "职工"),
+  INSPECTOR("inspector", "送检员"),
+  TESTER("tester", "实验员"),
+  ;
+
+  private final String code;
+  private final String info;
+
+  PostTypeEnum(String code, String info) {
+    this.code = code;
+    this.info = info;
+  }
+
+  public String getCode() {
+    return code;
+  }
+
+  public String getInfo() {
+    return info;
+  }
+
+  public static PostTypeEnum ofValue(String code) {
+    for (PostTypeEnum investor : PostTypeEnum.values()) {
+      if (investor.getCode().equals(code)) {
+        return investor;
+      }
+    }
+    return STAFF;
+  }
+}