fix(auth-service调用app-service接口使用orgId错误修改): auth-service调用app-service接口使用orgId错误修改

auth-service调用app-service接口使用orgId错误修改

dcuc-app-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.3-tjdsj-SNAPSHOT</version>
+        <version>2.2.4-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -102,14 +102,14 @@ public interface IApplyInfoFacade {
     @PostMapping(value = "isRepeat")
     ResponseStatus isRepeat(@RequestBody ApplyInfo applyInfo);
 
-    /**
-     * 根据机构ID获取所有应用ID
-     *
-     * @param orgId 机构id
-     * @return 应用ID集合
-     */
-    @RequestMapping(value = "getAppIdsByOrgId")
-    List<String> getAppIdsByOrgId(@RequestParam("orgId") String orgId);
+//    /**
+//     * 根据机构ID获取所有应用ID
+//     *
+//     * @param orgId 机构id
+//     * @return 应用ID集合
+//     */
+//    @RequestMapping(value = "getAppIdsByOrgId")
+//    List<String> getAppIdsByOrgId(@RequestParam("orgId") String orgId);
 
     /**
      * 根据施工人员id查看该人员负责的应用

dcuc-app-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.3-tjdsj-SNAPSHOT</version>
+        <version>2.2.4-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dcuc-app-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-app</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.2.3-tjdsj-SNAPSHOT</version>
+        <version>2.2.4-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -116,10 +116,10 @@ public class ApplyInfoFacade implements IApplyInfoFacade {
         return applyInfoService.isRepeat(applyInfo);
     }
 
-    @Override
-    public List<String> getAppIdsByOrgId(String orgId) {
-        return applyInfoService.getAppIdsByOrgId(orgId);
-    }
+//    @Override
+//    public List<String> getAppIdsByOrgId(String orgId) {
+//        return applyInfoService.getAppIdsByOrgId(orgId);
+//    }
 
     @Override
     public List<ApplyInfo> fzxmList(String userId) {

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

@@ -160,21 +160,23 @@ public class ApplyInfoServiceImpl extends BaseMybatisService<ApplyInfo, String>
         }
 
         String id = applyInfo.getId();
-        String orgId = applyInfo.getOrgId();
+        String orgCode = applyInfo.getOrgCode();
         //旧应用
         ApplyInfo oldApplyInfo = applyInfoMapper.selectById(id);
         if(null == oldApplyInfo) {
             return null;
         }
-        String oldOrgId = oldApplyInfo.getOrgId();
+        String oldOrgCode = oldApplyInfo.getOrgCode();
 
         applyInfo.setDeleted(BooleanEnum.FALSE.getValue());
 
+        OrgInfo orgInfo = orgInfoFacade.getOrgInfoByCode(orgCode);
+        applyInfo.setOrgId(orgInfo.getId());
         applyOauthService.updateOauth(applyInfo);
         applyInfoMapper.updateById(applyInfo);
 
         // 更新施工人员冗余信息
-        if (StringUtils.isNotBlank(orgId) && StringUtils.isNotBlank(oldOrgId) && !oldOrgId.equals(orgId)) {
+        if (StringUtils.isNotBlank(orgCode) && StringUtils.isNotBlank(oldOrgCode) && !oldOrgCode.equals(orgCode)) {
             eventPublisher.publishUpdateUserInfoEvent(new UpdateUserInfoEventDTO(applyInfo));
         }
         if (CollectionUtils.isNotEmpty(file)) {

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-app</artifactId>
-    <version>2.2.3-tjdsj-SNAPSHOT</version>
+    <version>2.2.4-tjdsj-SNAPSHOT</version>
     <packaging>pom</packaging>
     <modules>
         <module>dcuc-app-api</module>
@@ -18,7 +18,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!--revisions需写死，用于标识打包的版本号，不可删除-->
-        <revision>2.2.3-tjdsj-SNAPSHOT</revision>
+        <revision>2.2.4-tjdsj-SNAPSHOT</revision>
         <duceap.version>2.1.0-SNAPSHOT</duceap.version>
         <oracle.version>11.2.0.1.0</oracle.version>
         <mysql.version>5.1.49</mysql.version>