部门管理 新增、修改、查看 人员下拉框获取单位下所有人员

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

@@ -253,7 +253,7 @@ public class ProjectController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
 	@ApiOperation(httpMethod = "GET", value = "查询下拉选择框的值", notes = "查询下拉选择框的值")
 	@GetMapping(value = "/getCharge")
-	public ResponseModel<List<OrgUsr>> getCharge(){
+	public ResponseModel<List<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

@@ -376,11 +376,19 @@ public class OrgServiceImpl {
      * @return
      */
     @BusinessIdentify
-    public List<OrgUsr> getCharge(){
+    public List<List<OrgUsr>> getCharge() {
+        List<List<OrgUsr>> orgUsrs = new ArrayList<>();
         LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>();
-        personWrapper.eq(OrgUsr::getParentId,String.valueOf(getReginParams().getBusinessInfo().getCompanySequenceNbr()))
-                .eq(OrgUsr :: getBizOrgType,OrgEnum.普通人员.getKey());
-        return orgUsrServiceImpl.list(personWrapper);
+        //获取单位下人员
+        personWrapper.eq(OrgUsr::getParentId, String.valueOf(getReginParams().getBusinessInfo().getCompanySequenceNbr()))
+                .eq(OrgUsr::getBizOrgType, OrgEnum.普通人员.getKey());
+        orgUsrs.add(orgUsrServiceImpl.list(personWrapper));
+        //获取单位下的部门人员
+        LambdaQueryWrapper<OrgUsr> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(OrgUsr::getParentId, String.valueOf(getReginParams().getBusinessInfo().getCompanySequenceNbr())).eq(OrgUsr::getBizOrgType, "DEPARTMENT");
+        orgUsrs.add(orgUsrServiceImpl.list(lambdaQueryWrapper));
+
+        return orgUsrs;
     }
 
     /**