优化下拉选择接口

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

@@ -143,7 +143,7 @@ public class ProjectController extends BaseController {
 
 	/**
 	 * 获取下拉选择值
-	 * @param type CHARGE("建设单位负责人")、INSTALL("安装单位")、DESIGN("设计单位")
+	 * @param type INSTALL("安装单位")、DESIGN("设计单位")
 	 * @return
 	 */
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@@ -152,4 +152,15 @@ public class ProjectController extends BaseController {
 	public ResponseModel<List<OrgUsr>> getSelectInfo(String type){
 		return ResponseHelper.buildResponse(orgServiceImpl.getSelectInfo(type));
 	}
+
+	/**
+	 * 查询当前登录单位下的人员列表
+	 * @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());
+	}
 }

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

@@ -130,8 +130,6 @@ public class OrgServiceImpl {
         if (OrgPersonEnum.人员.getKey().equals(bizOrgType)){
             if (1==jsonObject.getInteger("isWelder")) {
                 orgUsr.setOrgExpandAttr1(OrgPersonEnum.焊工.getKey());
-            }else{
-                orgUsr.setOrgExpandAttr1(OrgPersonEnum.企业管理员.getKey());
             }
             LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(reginParams.getCompany().getSequenceNbr()));
@@ -211,7 +209,7 @@ public class OrgServiceImpl {
 
     /**
      * 获取下拉选择值
-     * @param type CHARGE("建设单位负责人")、INSTALL("安装单位")、DESIGN("设计单位")
+     * @param type INSTALL("安装单位")、DESIGN("设计单位")
      * @return
      */
     public List<OrgUsr> getSelectInfo(String type){
@@ -219,4 +217,17 @@ public class OrgServiceImpl {
         wrapper.eq(OrgUsr :: getOrgExpandAttr1,type);
        return  orgUsrServiceImpl.list(wrapper);
     }
+
+    /**
+     * 查询当前登录单位下的人员列表
+     * @return
+     */
+    public List<OrgUsr> getCharge(){
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr :: getAmosOrgId,String.valueOf(getReginParams().getCompany().getSequenceNbr()));
+        LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>();
+        personWrapper.eq(OrgUsr::getParentId,orgUsrServiceImpl.getOne(wrapper).getSequenceNbr())
+                .eq(OrgUsr :: getBizOrgType,OrgPersonEnum.人员.getKey());
+        return orgUsrServiceImpl.list(personWrapper);
+    }
 }