Merge remote-tracking branch 'remotes/origin/dev' into release

epmet-auth/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.58
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.59
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.58</version>
+    <version>0.3.59</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -72,6 +72,7 @@
 		AND  <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() -- 报名截止时间  >= 当前时间
         AND (i.ACT_QUOTA_CATEGORY = 0 OR i.ACT_QUOTA > IFNULL(c.signupNum, 0)) -- 不限名额或者报名人数未报满
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.ACT_QUOTA_CATEGORY DESC,i.CREATED_TIME DESC
     </select>
 
@@ -99,6 +100,7 @@
         AND i.ACT_QUOTA_CATEGORY = 1   -- 固定名额
         AND i.ACT_QUOTA = IFNULL(c.signupNum, 0) -- 名额已满
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -125,6 +127,7 @@
         AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW() )
         AND i.ACT_STATUS != 'canceled'
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -151,6 +154,7 @@
         AND ( <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW() AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW() )
         AND i.ACT_STATUS != 'canceled'
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
     </select>
 
@@ -176,6 +180,7 @@
         AND i.ACT_STATUS != 'canceled'
         AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
         AND i.CUSTOMER_ID = #{customerId}
+        GROUP BY i.ID
         ORDER BY i.CREATED_TIME DESC
         LIMIT #{pageNo}, #{pageSize}
     </select>

epmet-module/oper-crm/oper-crm-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   oper-crm-server:
     container_name: oper-crm-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.56
+    image: 192.168.1.130:10080/epmet-cloud-dev/oper-crm-server:0.3.57
     ports:
       - "8090:8090"
     network_mode: host # 使用现有网络

epmet-module/oper-crm/oper-crm-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.56</version>
+    <version>0.3.57</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>oper-crm</artifactId>

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

@@ -445,7 +445,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		resultDTO.setMobile(partyMemberInfo.getMobile());
 		resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding());
 		List<String> failedReason = new ArrayList<>();
-		if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) {
+		if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()&& !("null").equals(fromDTO.getAutoId())) {
 			PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId());
 			resultDTO.setCertifyTime(autoEntity.getContrastTime().getTime());
 			if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) {

epmet-user/epmet-user-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.97
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.98
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.97</version>
+    <version>0.3.98</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBaseInfoDao.java

@@ -18,7 +18,6 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.result.ResiUserBaseInfoResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.dto.result.UserWechatResultDTO;

epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserBaseInfoRedis.java

@@ -172,6 +172,7 @@ public class UserBaseInfoRedis {
                     && StringUtils.isNotBlank(gridResult.getData().getBelongsGridName())){
                 String gridFullName = gridResult.getData().getBelongsGridName();
                 currentCache.setRegisteredGridName(gridFullName);
+                if(StringUtils.isBlank(currentCache.getGender()))currentCache.setGender(NumConstant.ZERO_STR);
                 StringBuffer buffer = new StringBuffer(gridFullName.split(ModuleConstant.DASH)[NumConstant.ONE]).append(ModuleConstant.DASH).append(currentCache.getSurname());
                 switch (currentCache.getGender()) {
                     case NumConstant.ONE_STR:

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -154,7 +154,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 
 	/**
 	 * 居民注册信息提交
-	 *
 	 * @param userResiInfoDTO
 	 * @Author sunUserRoleServiceImpl
 	 */