添加企业的部门信息及人员接口

zlmy-modules/zlmy-boot/src/main/java/com/testor/module/sys/controller/NewSysOrgController.java

@@ -10,6 +10,7 @@ import com.testor.biz.sys.dict.data.service.SysDictDataService;
 import com.testor.biz.sys.org.OrgEnumCode;
 import com.testor.biz.sys.org.model.domain.SysOrg;
 import com.testor.biz.sys.org.model.dto.DeptAndPost;
+import com.testor.biz.sys.org.model.dto.ReturnOrg;
 import com.testor.biz.sys.org.model.dto.SysOrgCreateAndUpdateRequest;
 import com.testor.biz.sys.org.model.dto.SysOrgParam;
 import com.testor.biz.sys.org.service.OrgExcelImport;
@@ -85,7 +86,7 @@ public class NewSysOrgController extends SuperController {
     @Autowired
     private NewSysOrgService sysOrgService;
     @Autowired
-    private OrgExcelImport orgExcelImport;
+    private SysUserService sysUserService;
     @Autowired
     private TSysPostService tSysPostService;
     @Autowired
@@ -530,5 +531,30 @@ public class NewSysOrgController extends SuperController {
         return children;
     }
 
+    @ApiOperation(
+            value = "【返回企业的部门信息及人员】",
+            notes = ""
+    )
+    @GetMapping({"/returnDeptPerson"})
+    public BaseResponse<ReturnOrg> returnDeptPersons(String orgId) {
+        BaseResponse<ReturnOrg> baseResponse = new BaseResponse<>();
+        if (StringUtils.isBlank(orgId)) {
+            orgId = ContextUtils.getLoginUser().getOrgId();
+        }
+        SysOrg one = this.sysOrgService.getOne(new QueryWrapper<NewSysOrg>().eq("org_id", orgId).ne("status", "1"));
+        ReturnOrg returnOrg = (ReturnOrg)BeanHelper.beanToBean(one, ReturnOrg.class);
+        List<NewSysOrg> list = this.sysOrgService.list(new QueryWrapper<NewSysOrg>().eq("parent_id", returnOrg.getOrgId()).eq("is_dept", "1").ne("status", "1"));
+        ArrayList<SysOrg> returnOrgs = new ArrayList<>();
 
+        for(SysOrg org : list) {
+            ReturnOrg returnOrg1 = BeanHelper.beanToBean(org, ReturnOrg.class);
+            List<SysUser> list1 = this.sysUserService.list(new QueryWrapper<SysUser>().eq("dept_id", returnOrg1.getOrgId()).ne("status", "1"));
+            returnOrg1.setUsers(list1);
+            returnOrgs.add(returnOrg1);
+        }
+
+        returnOrg.setOrgList(returnOrgs);
+        baseResponse.setData(returnOrg);
+        return baseResponse;
+    }
 }