添加人员筛选

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

@@ -253,8 +253,8 @@ public class ProjectController extends BaseController {
 	@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(Long sequenceNbr){
+		return ResponseHelper.buildResponse(orgServiceImpl.getCharge(sequenceNbr));
 	}
 
 	/**

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

@@ -28,6 +28,7 @@ import com.yeejoin.amos.boot.module.ugp.biz.framework.BusinessIdentify;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import org.python.antlr.ast.If;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -376,18 +377,20 @@ public class OrgServiceImpl {
      * @return
      */
     @BusinessIdentify
-    public List<OrgUsr> getCharge() {
+    public List<OrgUsr> getCharge(Long sequenceNbr) {
         List<OrgUsr> orgUsrs = new ArrayList<>();
         LambdaQueryWrapper<OrgUsr> personWrapper = new LambdaQueryWrapper<>();
         //获取单位下人员
         personWrapper.eq(OrgUsr::getParentId, String.valueOf(getReginParams().getBusinessInfo().getCompanySequenceNbr()))
                 .eq(OrgUsr::getBizOrgType, OrgEnum.普通人员.getKey());
-        orgUsrs.addAll(orgUsrServiceImpl.list(personWrapper));;
-        //获取单位下的部门人员
-        LambdaQueryWrapper<OrgUsr> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(OrgUsr::getParentId, String.valueOf(getReginParams().getBusinessInfo().getCompanySequenceNbr())).eq(OrgUsr::getBizOrgType, "DEPARTMENT");
-        orgUsrs.addAll(orgUsrServiceImpl.list(lambdaQueryWrapper));
+        orgUsrs.addAll(orgUsrServiceImpl.list(personWrapper));
 
+        //获取单位下的部门人员
+        if (!ValidationUtil.isEmpty(sequenceNbr)) {
+            LambdaQueryWrapper<OrgUsr> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+            lambdaQueryWrapper.eq(OrgUsr::getParentId, sequenceNbr);
+            orgUsrs.addAll(orgUsrServiceImpl.list(lambdaQueryWrapper));
+        }
         return orgUsrs;
     }