Merge branch 'master' of http://121.42.41.42:7070/r/epmet-cloud into yantai_zhengwu_master

 Conflicts:

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

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

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

@@ -497,4 +497,10 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
                                                          @Param("orgIdPath") String orgIdPath,
                                                          @Param("codeType")String codeType,
                                                          @Param("code") String code);
+    /**
+     * 根据ic_resi_user.id查询，不限制任何状态
+     * @param icResiUserId
+     * @return
+     */
+    IcResiUserEntity getById(String icResiUserId);
 }

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

@@ -1720,7 +1720,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
 
     @Override
     public IcResiUserDTO get(String icResiUserId) {
-        IcResiUserEntity icResiUserEntity = baseDao.selectById(icResiUserId);
+        IcResiUserEntity icResiUserEntity =baseDao.getById(icResiUserId);
         return ConvertUtils.sourceToTarget(icResiUserEntity, IcResiUserDTO.class);
     }
 

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

@@ -1737,4 +1737,8 @@
         </if>
         order by u.ID asc
     </select>
+    <!-- 不限制任何状态   -->
+    <select id="getById" parameterType="java.lang.String" resultType="com.epmet.entity.IcResiUserEntity">
+        select r.*  from ic_resi_user r where r.id = #{icResiUserId}
+    </select>
 </mapper>