Merge remote-tracking branch 'origin/dev'

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml

@@ -190,7 +190,6 @@
                 customer_department cd
             WHERE
                 cd.id = #{deptId}
-            AND cd.DEL_FLAG = '0'
             )
     </select>
 

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

@@ -583,7 +583,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			Result result = epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
 			log.info("isResiRegister epmetUserFeignClient.saveResiInfo result:{}",JSON.toJSONString(result));
 			if (!result.success()){
-				throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode(),EpmetErrorCode.SERVER_ERROR.getMsg());
+				throw new RenException(result.getCode(),result.getMsg());
 			}
 		}else{
 			log.info("isResiRegister partyMember have registered resi，userId:{}",partyMemberInfoDTO.getUserId());

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

@@ -316,8 +316,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			//更新该用户在该客户下的注册状态
 			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		}else{
-			log.error("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
-			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode());
+			log.warn("手机号客户内不可用，没有更新用户信息，param:{}", JSON.toJSONString(userResiInfoDTO));
+			throw new RenException(EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getCode(),EpmetErrorCode.THE_MOBILE_HAS_BEEN_USED.getMsg());
 		}
 
 		return result;