获取监检机构下的人员

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/ProjectController.java

@@ -235,15 +235,14 @@ public class ProjectController extends BaseController {
 	}
 
 	/**
-	 * 查询当前登录单位下的人员列表
+	 * 查询监检机构下的人员列表
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "查询下拉选择框的值", notes = "查询下拉选择框的值")
 	@GetMapping(value = "/getCharge")
-	public ResponseModel<List<OrgUsr>> getCharge(){
-
-		return ResponseHelper.buildResponse(orgServiceImpl.getCharge());
+	public ResponseModel<List<OrgUsr>> getCharge(String insDepId){
+		return ResponseHelper.buildResponse(orgServiceImpl.getVerInfo(insDepId));
 	}
 
 	/**

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/OrgServiceImpl.java

@@ -232,6 +232,28 @@ public class OrgServiceImpl {
         return page;
     }
 
+
+    /**
+     * 获取监检机构下的人员
+     *
+     * @param insDepId 机构id
+     * @return
+     */
+    public List<OrgUsr> getVerInfo(String insDepId) {
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr::getSequenceNbr, insDepId);
+        OrgUsr orgUsrCompany = orgUsrServiceImpl.getOne(wrapper);
+
+        LambdaQueryWrapper<OrgUsr> welderWrapper = new LambdaQueryWrapper<>();
+        welderWrapper.likeRight(OrgUsr::getBizOrgCode, orgUsrCompany.getBizOrgCode()).eq(OrgUsr::getBizOrgType, OrgEnum.普通人员.getKey());
+        //默认拿到为空的getOrgExpandAttr1
+        welderWrapper.isNull(OrgUsr::getOrgExpandAttr1);
+        List<OrgUsr> orgUsrList = orgUsrServiceImpl.list(welderWrapper);
+
+
+        return orgUsrList;
+    }
+
     /**
      * 根据id查询详细信息
      * @param sequenceNbr