Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

# Conflicts:
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java
#	epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java

@@ -98,7 +98,9 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审
 	 * 小组等级
 	 */
 	private Integer level;
-
 	private String agencyId;
+
+	private String orgIdPath;
+
 	private String pids;
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -32,6 +32,8 @@ import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
 import com.epmet.commons.tools.scan.param.ImgTaskDTO;
 import com.epmet.commons.tools.scan.param.TextScanParamDTO;
@@ -608,6 +610,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiGroupEntity.setGroupType(applyCreateGroupFormDTO.getGroupType());
 		resiGroupEntity.setPartyOrgId(applyCreateGroupFormDTO.getPartyOrgId());
 		resiGroupEntity.setPartyOrgPids(applyCreateGroupFormDTO.getPartyOrgPids());
+
+		GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(applyCreateGroupFormDTO.getGridId());
+		resiGroupEntity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridInfo.getId(), gridInfo.getPids()));
+		resiGroupEntity.setAgencyId(gridInfo.getPid());
 		return resiGroupEntity;
 	}
 

epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__group_add_orgidpath_agencyid.sql

@@ -0,0 +1,2 @@
+alter table resi_group add column AGENCY_ID varchar(64) comment '所属组织id' after GRID_ID;
+alter table resi_group add column ORG_ID_PATH varchar(512) comment '组织idpath' after AGENCY_ID;

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java

@@ -31,6 +31,6 @@ public class EditPrincipalFormDTO implements Serializable {
     @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class)
     private String principalMobile;
 
-    @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class)
+    // @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class)
     private String principalStaffId;
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -335,7 +335,7 @@
             </when>
             <otherwise>
                 ORDER BY
-                IC_RESI_USER.GRID_ID desc,
+                IC_RESI_USER.GRID_ID asc,
                 IC_RESI_USER.VILLAGE_ID ASC,
                 IC_RESI_USER.BUILD_ID ASC,
                 IC_RESI_USER.UNIT_ID ASC,