修改树的展示方法

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

@@ -269,7 +269,7 @@ public class MaintenanceCompanyController extends BaseController {
 	@GetMapping(value = "departmentAndPerson/getTree")
 	@ApiOperation(httpMethod = "GET", value = "查询部门-人树结构数据", notes = "查询部门-人树结构数据")
 	public ResponseModel<List<OrgMenuDto>> getDepartmentTree(@RequestParam long sequenceNbr) throws Exception {
-		List<OrgMenuDto> menus = iOrgUsrService.getTree(null,
+		List<OrgMenuDto> menus = iOrgUsrService.getTree(sequenceNbr,
 				maintenanceCompanyService.getDepartmentAndPersonTree(sequenceNbr), MaintenanceCompany.class.getName(),
 				"getSequenceNbr", 2, "getName", "getParentId", "getType");
 		return ResponseHelper.buildResponse(menus);
@@ -285,7 +285,7 @@ public class MaintenanceCompanyController extends BaseController {
 	@GetMapping(value = "/getDepartmentList")
 	@ApiOperation(httpMethod = "GET", value = "查询部门下拉列表数据", notes = "查询部门下拉列表数据")
 	public ResponseModel<List<OrgMenuDto>> getDepartmentList(@RequestParam long sequenceNbr) throws Exception {
-		List<OrgMenuDto> menus = iOrgUsrService.getTree(null, maintenanceCompanyService.getDepartmentList(sequenceNbr),
+		List<OrgMenuDto> menus = iOrgUsrService.getTree(sequenceNbr, maintenanceCompanyService.getDepartmentList(sequenceNbr),
 				MaintenanceCompany.class.getName(), "getSequenceNbr", 2, "getName", "getParentId", "getType");
 		return ResponseHelper.buildResponse(menus);
 	}

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

@@ -207,6 +207,7 @@ public class MaintenanceCompanyServiceImpl
 	public List<Map<String, Object>> getMaintenanceCompanyDropDownList() {
 		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
 		wrapper.select(MaintenanceCompany::getCode, MaintenanceCompany::getName);
+		wrapper.eq(MaintenanceCompany::getType, COMPANY);
 		return maintenanceCompanyMapper.selectMaps(wrapper);
 	}
 
@@ -506,7 +507,7 @@ public class MaintenanceCompanyServiceImpl
 	public List<MaintenanceCompany> getDepartmentList(long sequenceNbr) {
 		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
 		wrapper.select(MaintenanceCompany::getSequenceNbr,MaintenanceCompany::getName,MaintenanceCompany::getCode,MaintenanceCompany::getType,MaintenanceCompany::getBizCode,MaintenanceCompany::getParentId);
-		wrapper.eq(MaintenanceCompany::getIsDelete, 0);
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
 		wrapper.eq(MaintenanceCompany::getType, DEPARTMENT);
 		wrapper.eq(MaintenanceCompany::getParentId, sequenceNbr);
 		return	maintenanceCompanyMapper.selectList(wrapper);
@@ -515,7 +516,7 @@ public class MaintenanceCompanyServiceImpl
 	public List<MaintenanceCompany> getPersonList(long sequenceNbr) {
 		LambdaQueryWrapper<MaintenanceCompany> wrapper = new LambdaQueryWrapper<>();
 		wrapper.select(MaintenanceCompany::getSequenceNbr,MaintenanceCompany::getName,MaintenanceCompany::getCode,MaintenanceCompany::getType,MaintenanceCompany::getBizCode,MaintenanceCompany::getParentId);
-		wrapper.eq(MaintenanceCompany::getIsDelete, 0);
+		wrapper.eq(MaintenanceCompany::getIsDelete, false);
 		wrapper.eq(MaintenanceCompany::getType, PERSON);
 		wrapper.eq(MaintenanceCompany::getParentId, sequenceNbr);
 		return	maintenanceCompanyMapper.selectList(wrapper);

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

@@ -123,8 +123,8 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			parentId = !ObjectUtils.isEmpty(PARENTIDMethodNameme.invoke(entity))
 					? Long.valueOf(String.valueOf(PARENTIDMethodNameme.invoke(entity)))
 					: null;
-
-			if (parentId == null || topId == parentId) {
+ 
+			if (parentId == null || topId.equals(parentId) ) {//topId与parentId的等值判断，修改人陈浩 on 2021/07/21
 				OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
 						String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
 						String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);