Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IMaintenanceCompanyService.java

@@ -8,6 +8,7 @@ import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceCompanyDto;
 import com.yeejoin.amos.boot.module.common.api.dto.MaintenanceDepartmentDto;
 import com.yeejoin.amos.boot.module.common.api.dto.MaintenancePersonDto;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 
 /**
  * 维保单位接口类
@@ -30,7 +31,7 @@ public interface IMaintenanceCompanyService {
 	 * @param maintenanceCompany
 	 * @return
 	 */
-	public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, String Companycode);
+	public boolean savePersonDetail(MaintenancePersonDto maintenancePerson, Map<String, Long> params);
 
 	/**
 	 * 自定义假删除
@@ -53,7 +54,7 @@ public interface IMaintenanceCompanyService {
 	 * @param maintenanceDepartment
 	 * @return
 	 */
-	public boolean saveDepartmentDetail(MaintenanceDepartmentDto maintenanceDepartment ,String Companycode);
+	public boolean saveDepartmentDetail(MaintenanceDepartmentDto maintenanceDepartment, long sequenceNbr) ;
 
 	/**
 	 * 检查当前的员工编号是否已经存在
@@ -81,20 +82,20 @@ public interface IMaintenanceCompanyService {
 	 * @param maintenanceType 类型（COMPANY单位，PERSON人员，DEPARTMENT部门）
 	 * @return
 	 */
-	IPage<Map<String, Object>> getPageMaintenanceList(int current, int size, String maintenanceType,String name,long parentId,String isWork);
+	IPage<Map<String, Object>> getPageMaintenanceList( Map<String, Object> paramsMap);
 	
 	/**根据主键查询对应的信息
 	 * @param sequenceNbr 主键
 	 * @return
 	 */
-	Map<String, Object>	findByInstanceId(Long instanceId,String maintenanceType );
+	Map<String, Object>	findBySequenceNbr(Long sequenceNbr,String maintenanceType );
 	
 	/**
 	 * 修改维保单位
 	 * @param model
 	 * @return
 	 */
-	boolean updateMaintenanceCompanyDetail(MaintenanceCompanyDto model);
+	boolean updateMaintenanceCompanyDetail(MaintenanceCompanyDto model,AgencyUserModel userInfo);
 	
 	
 	/**
@@ -102,17 +103,16 @@ public interface IMaintenanceCompanyService {
 	 * @param MaintenanceDepartmentDto
 	 * @return
 	 */
-	public boolean updateMaintenancDepartmentDetail(MaintenanceDepartmentDto model, String Companycode);
+	public boolean updateMaintenancDepartmentDetail(MaintenanceDepartmentDto model,AgencyUserModel userInfo);
 	
 	
 	
 	/**
 	 * 修改维保人员
 	 * @param MaintenancePersonDto
-	 * @param  Companycode
 	 * @return
 	 */
-	public boolean updateMaintenancePersonDetail(MaintenancePersonDto model, String Companycode);
+	public boolean updateMaintenancePersonDetail(MaintenancePersonDto model,AgencyUserModel userInfo);
     /**
      * 查询所有的单位-部门树
      * @return

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

@@ -124,7 +124,12 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         Page page = new Page(current, size);
         return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
     }
-
+    public IPage<Map<String, Object>> pageList(int current, int size ,String groupCode,Map<String, String> params ){
+        List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
+        Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
+        Page page = new Page(current, size);
+        return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
+    }
     public List<Map<String, Object>> listAll(String groupCode){
         Map<String, String> params = this.getRequestParamMap();
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
@@ -149,7 +154,4 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         }
         return params;
     }
-
-
-
 }

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,13 +123,27 @@ 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 ==parentId ) {
+//				OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
+//						String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
+//						String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
+//				resultList.add(menu);
+//			}
+			/*	*******************topId与parentId的等值判断，修改人陈浩 on 2021/07/21---start******************************/
+			if (parentId == null ) {//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);
 				resultList.add(menu);
+			} else {
+				if(topId !=null && topId.longValue() ==parentId.longValue()) {
+					OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
+							String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
+							String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
+					resultList.add(menu);
+				}
 			}
+			/*	*******************topId与parentId的等值判断，修改人陈浩 on 2021/07/21---end******************************/
 		}
 		// 获取每个顶层元素的子数据集合
 		for (OrgMenuDto entity : resultList) {