Merge branch 'master' into lingshan_master

epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java

@@ -0,0 +1,35 @@
+package com.epmet.remote;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.feign.ResultDataResolver;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.dto.form.LoginUserDetailsFormDTO;
+import com.epmet.dto.result.LoginUserDetailsResultDTO;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * epmet用户远程服务工具
+ */
+@Component
+public class EpmetUserRemoteService implements ResultDataResolver {
+
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+    /**
+     * 查询当前登录用户信息
+     * @return
+     */
+    public LoginUserDetailsResultDTO getLoginUserDetails() {
+        //    不传组织id，则基于当前组织查询
+        LoginUserDetailsFormDTO loinUserForm = new LoginUserDetailsFormDTO();
+        loinUserForm.setApp(EpmetRequestHolder.getLoginUserApp());
+        loinUserForm.setClient(EpmetRequestHolder.getLoginUserClient());
+        loinUserForm.setUserId(EpmetRequestHolder.getLoginUserId());
+        LoginUserDetailsResultDTO loginUserDetailsResultDTO = getResultDataOrThrowsException(epmetUserOpenFeignClient.getLoginUserDetails(loinUserForm), ServiceConstant.GOV_ORG_SERVER,
+                null, null, "查询当前工作人员所属组织信息失败");
+        return loginUserDetailsResultDTO;
+    }
+}

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

@@ -61,6 +61,17 @@ public interface IcResiUserDao extends BaseDao<IcResiUserEntity> {
      **/
     void upTable(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
 
+    /**
+     * @description: 选择性更新（只更新不为null的）
+     * @param tableName:
+     * @param id:
+     * @param map:
+     * @return
+     * @author: WangXianZhang
+     * @date: 2023/4/23 9:03 PM
+     */
+    void updateTableSelective(@Param("tableName") String tableName, @Param("id") String id, @Param("map") Map<String, ?> map);
+
     List<Map<String, Object>> selectListResiMap(@Param("customerId") String customerId,
                                                 @Param("formCode") String formCode,
                                                 @Param("conditions") List<ResiUserQueryValueDTO> conditions,

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

@@ -547,7 +547,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 if (existingResiMap != null) {
                     // 修改居民信息
-                    icResiUserDao.upTable(tableName, existingResiMap.get("ID"), columnAndValues);
+                    icResiUserDao.updateTableSelective(tableName, existingResiMap.get("ID"), columnAndValues);
 
                     // 任意组织维度一个发生变化，则放到调动居民缓存中
                     ResiImportChangedData transferData;
@@ -747,7 +747,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 if (CollectionUtils.isNotEmpty(subInfos)) {
                     Map<String, Object> subInfo = subInfos.get(0);
                     // 附加信息存在，更新附加表内容
-                    icResiUserDao.upTable(targetTableName, subInfo.get("ID").toString(), columnAndValues);
+                    icResiUserDao.updateTableSelective(targetTableName, subInfo.get("ID").toString(), columnAndValues);
                 } else {
                     // 新增附加表信息
                     columnAndValues.put("CREATED_BY", currentUserId);
@@ -1577,7 +1577,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
     private void updateMainTableResiTypeFlag(IcResiUserTableEnum icResiUserTableEnum, String resiUserId) {
         HashMap<String, Boolean> map = new HashMap<>();
         map.put(icResiUserTableEnum.getMainTableFlagColumnName(), true);
-        icResiUserDao.upTable(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
+        icResiUserDao.updateTableSelective(IcResiUserTableEnum.IC_RESI_USER.getTableName(), resiUserId, map);
     }
 
     /**

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

@@ -73,6 +73,19 @@
         WHERE id = #{id}
     </update>
 
+    <!-- 选择性更新（只更新不为null的） -->
+    <update id="updateTableSelective">
+        UPDATE ${tableName}
+        SET
+        <foreach collection="map.entrySet()" index="key" item="value" separator=",">
+            <if test="value != null and value != ''">
+                ${key} = #{value}
+            </if>
+        </foreach>
+        ,UPDATED_TIME = NOW()
+        WHERE id = #{id}
+    </update>
+
 
     <select id="selectListMapById" parameterType="map" resultType="map">
         select * from ic_resi_user where del_flag='0' and id=#{icResiUserId} and customer_id=#{customerId}