Merge remote-tracking branch 'origin/dev_bugfix' into dev_bugfix

epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedDetailResultDTO.java

@@ -52,7 +52,7 @@ public class CertifiedDetailResultDTO implements Serializable {
     /**
      * 注册时间（进入本平台的时间）
      */
-    private Long certifyTime;
+    private Long registerTime;
 
     /**
      * 工作单位/所处街道

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml

@@ -51,6 +51,12 @@
         <foreach item="id" collection="listStr" open="(" separator="," close=")" index="">
             #{id}
         </foreach>
+        ORDER BY field(
+            id,
+        <foreach item="id" collection="listStr" separator=",">
+            #{id}
+        </foreach>
+        )<!-- 按照foreach中遍历的Id顺序排序(按组织机构自上而下排序) -->
     </select>
 
     <select id="selectSubAgencyById" resultType="com.epmet.dto.result.SubListResultDTO">

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerHomeFormDTO.java

@@ -16,19 +16,16 @@ public class CustomerHomeFormDTO implements Serializable {
 	/**
 	 * 客户ID
 	 */
-	@NotBlank(message = "客户ID不能为空")
 	private String customerId;
 
 	/**
 	 * 所属端类型0.居民端，1.政府端
 	 */
-	@NotBlank(message = "所属端类型不能为空（0居民端1政府端）")
 	private String clientType;
 
 	/**
 	 * 状态：0.已发布 1.草稿
 	 */
-	@NotBlank(message = "状态（0已发布1草稿）")
 	private String status;
 
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/HomeServiceImpl.java

@@ -53,6 +53,7 @@ public class HomeServiceImpl implements HomeService {
 	public Result<HomeDesignByCustomerResultDTO> getHomeDesignByCustomer(CustomerHomeFormDTO formDTO) {
 		HomeDesignByCustomerResultDTO resultDTO = new HomeDesignByCustomerResultDTO();
 		//根据客户id,所属端获取客户首页配置的设计稿
+		formDTO.setStatus(OperCustomizeConstant.STATUS_DRAFT);
 		List<CommonComponentDesignResultDTO> list = customerHomeDetailDao.selectCustomerHomeDetail(formDTO);
 		List<CommonComponentDesignResultDTO> titleList = new ArrayList<>();
 		List<CommonComponentDesignResultDTO> topList = new ArrayList<>();

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedDetailResultDTO.java

@@ -57,7 +57,7 @@ public class CertifiedDetailResultDTO implements Serializable {
     /**
      * 注册时间（进入本平台的时间）
      */
-    private Long certifyTime;
+    private Long registerTime;
 
     /**
      * 工作单位/所处街道

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java

@@ -185,7 +185,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl<PartymemberInfoD
 		time.setUserId(certifiedDetail.getUserId());
 		//查询用户注册时间
 		Result<CreatedTimeByUserIdResultDTO> registerTime = epmetUserFeignClient.createdTimeByUserId(time);
-		certifiedDetail.setCertifyTime(registerTime.getData().getRegisterTime());
+		certifiedDetail.setRegisterTime(registerTime.getData().getRegisterTime());
 		//查询gridFullName
 		Result<GridInfoResultDTO> gridInfoResult = govOrgFeignClient.queryGridInfo(certifiedDetail.getGridId());
 		String gridFullPath = "";

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -91,7 +91,7 @@
                 WHEN ( pi.confirm_result = 'approved' ) THEN 'manual'
             END AS certifyType,
             UNIX_TIMESTAMP(pi.created_time) AS applyTime,
-            organization_type AS extraOrganization,
+            IFNULL(extra_organization,'') AS extraOrganization,
             extra_certifier_name AS contactPeople,
             extra_certifier_mobile AS contactMobile,
             IFNULL(CONCAT(IFNULL(street,null),IFNULL(estate,null),IFNULL(building,null)),'') AS address

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

@@ -90,7 +90,7 @@
                 WHERE
                     ROLE_KEY IN
                         <foreach item="roleKey" collection="roleKeys" open="(" separator="," close=")">
-                        #{rolekey}
+                        #{roleKey}
                         </foreach>
                     AND DEL_FLAG = '0' )
             AND staffrole.STAFF_ID IN