修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -97,6 +97,7 @@
             u.biz_org_name bizOrgName,
             u.amos_org_id amosOrgId,
             u.biz_org_code bizOrgCode,
+            u.parent_id parentId,
             g.*
             FROM
             cb_org_usr u

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -795,6 +795,12 @@ public class OrgUsrController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "根据bizOrgCode查询公司部门 非树", notes = "根据bizOrgCode查询公司部门 非树")
+    @GetMapping(value = "find/getByOrgCode")
+    public ResponseModel<Object> getByOrgCode(@RequestParam String bizOrgCode) {
+        return ResponseHelper.buildResponse(iOrgUsrService.getByOrgCode(bizOrgCode));
+    }
 
 
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -413,8 +413,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		}
 
 		// 新加
-		if (!req.isEmpty() &&req.containsKey("OrgCode") && req.get("OrgCode") != null && req.get("OrgCode") != "") {
-
+		if (!ObjectUtils.isEmpty(req)&&req.containsKey("OrgCode") && req.get("OrgCode") != null && !req.get("OrgCode").equals("")) {
 			map.put("bizOrgCode", req.get("OrgCode"));
 			req.remove("OrgCode");
 		}
@@ -2415,8 +2414,19 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		wrapper.in(OrgUsr::getAmosOrgId, amosIds);
 		wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
 		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toList());
+	}
 
-
+	public List<OrgUsr>	getByOrgCode(String bizOrgCode) {
+		if (StringUtils.isEmpty(bizOrgCode)) {
+			return null;
+		}
+		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+		wrapper.likeRight(OrgUsr::getBizOrgCode,bizOrgCode);
+		wrapper.isNotNull(OrgUsr::getBizOrgCode);
+		wrapper.eq(BaseEntity::getIsDelete,false);
+		wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_DEPARTMENT)
+				.or().eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_COMPANY);
+		return this.baseMapper.selectList(wrapper).stream().collect(Collectors.toList());
 	}
 
 }
\ No newline at end of file

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/GroupController.java

@@ -3,6 +3,10 @@ package com.yeejoin.amos.patrol.business.controller;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
 import opennlp.tools.util.HashList;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +32,7 @@ import com.yeejoin.amos.patrol.feign.RemoteSecurityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 /**
  * 获取部门、公司信息
@@ -44,6 +49,8 @@ public class GroupController extends AbstractBaseController{
 	private RemoteSecurityService remoteSecurityService;
 	@Autowired
 	IEmailService emailService;
+	@Autowired
+	JcsFeignClient jcsFeignClient;
 
 	/**
 	 * 部门查询
@@ -143,10 +150,10 @@ public class GroupController extends AbstractBaseController{
 		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
 
 		ReginParams reginParams = getSelectedOrgInfo();
-		String companyId = reginParams.getCompany().getSequenceNbr().toString();
+		String bizOrgCode = reginParams.getPersonIdentity().getBizOrgCode();
 
 		// 获取部门及人员信息
-		res = getDeptAndUser(companyId);
+		res = getDeptAndUser(bizOrgCode);
 
 		return CommonResponseUtil.success(res);
 	}
@@ -156,17 +163,37 @@ public class GroupController extends AbstractBaseController{
 	 * @param companyId
 	 * @return
 	 */
-	private List<LinkedHashMap<String, Object>> getDeptAndUser( String companyId){
+	private List<LinkedHashMap<String, Object>> getDeptAndUser( String bizOrgCode){
 
 		List<LinkedHashMap<String, Object>> res = new ArrayList<>();
-		CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), companyId);
-		String loginOrgCode = String.valueOf(companyModel.getCompanyOrgCode());
-		List children = (List) companyModel.getChildren();
-
-		for (int i = 0; i < children.size(); i++) {
-			Map<String, Object> map = (LinkedHashMap) children.get(i);
+	//	CompanyModel companyModel = remoteSecurityService.listUserByCompanyId1(getToken(), getProduct(), getAppKey(), companyId);
+	//	String loginOrgCode = String.valueOf(companyModel.getCompanyOrgCode());
+	//	List children = (List) companyModel.getChildren();
+		ResponseModel<Object> byOrgCode = jcsFeignClient.getByOrgCode(bizOrgCode);
+		Map<String, Object> requestBody = new HashMap<>();
+		requestBody.put("OrgCode",bizOrgCode);
+		ResponseModel<Page<Map<String, Object>>>perSonList = jcsFeignClient.listPage(requestBody);
+
+		Page<Map<String, Object>> pag = perSonList != null ? perSonList.getResult() : null;
+		List<Map<String, Object>> records = pag != null ? pag.getRecords() : null;
+		List<Map<String, Object>> orgUsresult = (List<Map<String, Object>>)byOrgCode.getResult();
+		List<Map<String, Object>> userList = new ArrayList<>();
+		orgUsresult.stream().forEach(o->records.forEach(p->{
+			if (p.containsKey("parentId") && p.get("parentId") != null && o.get("sequenceNbr") != null){
+				if (p.get("parentId").toString().equals(o.get("sequenceNbr").toString())){
+					userList.add(p);
+					o.put("userModelList",userList);
+				}
+			}
+		}));
+
+
+		for (int i = 0; i < orgUsresult.size(); i++) {
+			Map<String, Object> map = (LinkedHashMap) orgUsresult.get(i);
+			if (map.containsKey("userModelList") && map.containsKey("bizOrgName") && !map.get("bizOrgName").equals("")){
 			LinkedHashMap<String, Object> dept = new LinkedHashMap<>();
-			if("其他".equals((map.get("departmentName").toString()))){
+
+				if("其他".equals((map.get("bizOrgName").toString()))){
 					dept.put("id", "-1");
 					dept.put("key", "-1");
 					dept.put("value", "-1");
@@ -181,18 +208,19 @@ public class GroupController extends AbstractBaseController{
 					dept.put("key", map.get("sequenceNbr"));
 					dept.put("value", map.get("sequenceNbr"));
 					dept.put("state", "open");
-				dept.put("orgCode", loginOrgCode+"-"+map.get("sequenceNbr"));
-				dept.put("label", map.get("departmentName"));
-				dept.put("title", map.get("departmentName"));
-				dept.put("name", map.get("departmentName"));
+					dept.put("orgCode", map.get("bizOrgCode"));
+					dept.put("label", map.get("bizOrgName"));
+					dept.put("title", map.get("bizOrgName"));
+					dept.put("name", map.get("bizOrgName"));
 					//人员集合
 					List userModelList = (List) map.get("userModelList");
 					dept.put("children", getUserModelList(userModelList, map.get("sequenceNbr")));
+					dept.put("type", map.get("bizOrgType"));
 				}
-			dept.put("type", "department");
 				dept.put("writeable", 0);
 				res.add(dept);
 			}
+		}
 		return res;
 	}
 
@@ -209,23 +237,24 @@ public class GroupController extends AbstractBaseController{
 		for(int i = 0; i < userModelList.size(); i++){
 			Map<String, Object> map = (LinkedHashMap) userModelList.get(i);
 			LinkedHashMap<String, Object> user = new LinkedHashMap<>();
-
-			if (set.add(map.get("userId").toString())) {
+			if (map.get("amosOrgId")!= null && map.get("bizOrgName")!= null ){
+				if (set.add(map.get("amosOrgId").toString())) {
 					user.put("id", map.get("sequenceNbr"));
 					if("-1".equals(deptId)){
 						user.put("key", map.get("sequenceNbr") + "-1");
-					user.put("value", map.get("userId").toString() + "@" + "-1");
+						user.put("value", map.get("amosOrgId").toString() + "@" + "-1");
 					}else{
 						user.put("key", map.get("sequenceNbr") + deptId.toString());
-					user.put("value", map.get("userId").toString() + "@" + deptId.toString());
+						user.put("value", map.get("amosOrgId").toString() + "@" + deptId.toString());
 					}
-				user.put("label", map.get("realName"));
-				user.put("title", map.get("realName"));
-				user.put("name", map.get("realName"));
-				user.put("userId", map.get("userId"));
+					user.put("label", map.get("bizOrgName"));
+					user.put("title", map.get("bizOrgName"));
+					user.put("name", map.get("bizOrgName"));
+					user.put("userId", map.get("amosOrgId"));
 					res.add(user);
 				}
 			}
+		}
 
 		return res;
 	}

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/feign/JcsFeignClient.java

 package com.yeejoin.amos.patrol.business.feign;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
 import java.util.List;
@@ -31,5 +30,20 @@ public interface JcsFeignClient {
      **/
     @RequestMapping(value = "/org-usr/{companyId}/person/list", method = RequestMethod.GET)
     ResponseModel<List<Map<String, Object>>> getPersonListByCompanyId(@PathVariable String companyId);
+
+
+    /**
+     * 查询本单位下及下级部门下的人员
+     */
+    @GetMapping(value = "/org-person/list")
+    ResponseModel<Page<Map<String, Object>>> listPage(@RequestParam Map<String, Object> requestBody);
+
+    /**
+     * 根据bizOrgCode查询公司部门
+     */
+    @GetMapping(value = "/org-usr/find/getByOrgCode")
+    ResponseModel<Object> getByOrgCode(@RequestParam String bizOrgCode);
+
+
 }