fix: 修复应用机构无法更新

dcuc-app-api/src/main/java/com/dragoninfo/dcuc/app/facade/IApplyInfoFacade.java

@@ -14,6 +14,7 @@ import java.util.Map;
 /**
  * TODO
  * 注意事项：权限中心调用该接口后不能使用机构id,只能使用机构code
+ *
  * @author yica
  * @date 2018/8/7
  */
@@ -259,6 +260,7 @@ public interface IApplyInfoFacade {
 
     /**
      * 根据应用URL获取应用信息
+     *
      * @param applyUrl
      * @return
      */
@@ -267,6 +269,7 @@ public interface IApplyInfoFacade {
 
     /**
      * 应用导入
+     *
      * @param fileId
      * @return
      */
@@ -275,14 +278,16 @@ public interface IApplyInfoFacade {
 
     /**
      * 根据查询条件查询应用
+     *
      * @param applyStatus 应用状态
      * @return
      */
     @GetMapping(value = "findList")
-    List<ApplyInfo> findList(@RequestParam(value = "applyStatus",required = false) String applyStatus);
+    List<ApplyInfo> findList(@RequestParam(value = "applyStatus", required = false) String applyStatus);
 
     /**
      * 根据code集合获取应用列表
+     *
      * @param appCodes
      * @return
      */
@@ -291,9 +296,22 @@ public interface IApplyInfoFacade {
 
     /**
      * 条件查询-不分页
+     *
      * @param searchDTO
      * @return
      */
     @PostMapping("appInfoSearch")
     List<ApplyInfo> appInfoSearch(@RequestBody SearchDTO searchDTO);
+
+    /**
+     * 更新机构信息
+     *
+     * @param targetOrgCode 目标机构代码
+     * @param fullName      完整名称
+     * @param code          机构代码
+     * @return 状态
+     */
+    @PutMapping("updateOrgInfos")
+    ResponseStatus updateOrgInfos(@RequestParam("targetOrgCode") String targetOrgCode, @RequestParam("fullName") String fullName,
+                                  @RequestParam("code") String code);
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/facade/ApplyInfoFacade.java

@@ -75,6 +75,12 @@ public class ApplyInfoFacade implements IApplyInfoFacade {
         return applyInfoService.appInfoSearch(searchDTO);
     }
 
+    @Override
+    public ResponseStatus updateOrgInfos(String targetOrgCode, String fullName, String code) {
+        applyInfoService.updateOrgInfos(targetOrgCode, fullName, code);
+        return ResponseStatus.success();
+    }
+
     @Override
     public String getNewSort() {
         return applyInfoService.getNewSort();

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/mapper/ApplyInfoMapper.java

@@ -2,7 +2,6 @@ package com.dragoninfo.dcuc.app.mapper;
 
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragonsoft.duceap.mybaitsplus.core.BaseMybatisMapper;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * @author huangzqa
@@ -17,12 +16,4 @@ public interface ApplyInfoMapper extends BaseMybatisMapper<ApplyInfo> {
      */
     String getNewSort();
 
-    /**
-     * 根据机构信息更新用户信息
-     *
-     * @param orgCode 组织Code
-     * @param orgName 组织名称
-     */
-    void updateOrgInfo(@Param("orgCode") String orgCode, @Param("orgName") String orgName);
-
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/IApplyInfoService.java

@@ -247,8 +247,18 @@ public interface IApplyInfoService {
 
     /**
      * 条件查询-不分页
+     *
      * @param searchDTO
      * @return
      */
     List<ApplyInfo> appInfoSearch(SearchDTO searchDTO);
+
+    /**
+     * 更新机构信息
+     *
+     * @param targetOrgCode 目标机构代码
+     * @param fullName      完整名称
+     * @param code          机构代码
+     */
+    void updateOrgInfos(String targetOrgCode, String fullName, String code);
 }

dcuc-app-service/src/main/java/com/dragoninfo/dcuc/app/service/impl/ApplyInfoServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dragoninfo.dcuc.app.dto.ApplyInfoDTO;
-import com.dragoninfo.dcuc.app.dto.UpdateUserInfoEventDTO;
 import com.dragoninfo.dcuc.app.entity.ApplyInfo;
 import com.dragoninfo.dcuc.app.entity.ManufacturerInfo;
 import com.dragoninfo.dcuc.app.mapper.ApplyInfoMapper;
@@ -444,7 +443,7 @@ public class ApplyInfoServiceImpl implements IApplyInfoService {
             for (ApplyInfo app : apps) {
                 String orgCode = app.getOrgCode();
                 OrgInfo orgInfo = map.get(orgCode);
-                if(orgInfo != null) {
+                if (orgInfo != null) {
                     app.setOrgName(orgInfo.getFullName());
                 }
             }
@@ -456,6 +455,21 @@ public class ApplyInfoServiceImpl implements IApplyInfoService {
         return applyInfoMapper.findBySearchable(Searchable.toSearchable(searchDTO));
     }
 
+    @CacheEvict(allEntries = true)
+    @Override
+    public void updateOrgInfos(String targetOrgCode, String fullName, String code) {
+        LambdaQueryWrapper<ApplyInfo> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(ApplyInfo::getOrgCode, targetOrgCode);
+
+        ApplyInfo applyInfo = new ApplyInfo();
+        applyInfo.setOrgName(fullName);
+
+        if (!targetOrgCode.equals(code)) {
+            applyInfo.setOrgCode(code);
+        }
+        applyInfoMapper.update(applyInfo, queryWrapper);
+    }
+
     @Override
     public List<ApplyInfo> findList(String applyStatus) {
         LambdaQueryWrapper<ApplyInfo> queryWrapper = new LambdaQueryWrapper<>();

dcuc-app-service/src/main/resources/mapping/ApplyInfoMapper.xml

@@ -6,10 +6,4 @@
         select max(sort) as sort
         from t_apply_info
     </select>
-
-    <update id="updateOrgInfo">
-        update t_apply_info
-        set org_name = #{orgName}
-        where org_code = #{orgCode}
-    </update>
 </mapper>