From 6e4fcdba50fa1d51e51c185e345b8dc83ac00cda Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Wed, 19 Jul 2023 09:29:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=20?=
 =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=20=E6=9B=B4=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/ding/task/EmployeeBatchGetTask.java      |  1 -
 .../ningdatech/pmapi/irs/manage/AppIrsManage.java  | 54 +++++++++++-----------
 2 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/ding/task/EmployeeBatchGetTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/ding/task/EmployeeBatchGetTask.java
index c8a1eb8..e5fccfa 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/ding/task/EmployeeBatchGetTask.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/ding/task/EmployeeBatchGetTask.java
@@ -261,7 +261,6 @@ public class EmployeeBatchGetTask {
             iUserInfoService.save(userInfo);
         }else{
             userInfo.setAvatar(dingEmployeeInfo.getAvatar());
-            userInfo.setUpdateOn(LocalDateTime.now());
             iUserInfoService.updateById(userInfo);
         }
     }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java
index d92e119..ae6fb19 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/irs/manage/AppIrsManage.java
@@ -108,37 +108,35 @@ public class AppIrsManage {
 
         ApiResponse body = forEntity.getBody();
 
-        if(Objects.isNull(body)){
+        if(Objects.isNull(body) || Objects.isNull(body.getCode())
+                || 0 != body.getCode()){
             return Boolean.FALSE;
         }
 
-        if(Objects.nonNull(body.getSuccess())
-                && body.getSuccess()){
-            //保存关系
-            app.setAppCode(appCode);
-            if(applicationService.updateById(app)){
-                /**
-                 * 判断下 如果成功的话 那么判断下 这个项目的初次创建的app 是否都已经被注册
-                 * 如果都已经注册 要调用状态机 进入下一个状态
-                 */
-                List<ProjectApplication> apps = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
-                        .eq(ProjectApplication::getProjectId, project.getId()));
-                //筛选出 初次新建的app 但是没有appCode的
-                apps = apps.stream().filter(a -> {
-                            if(CommonEnum.YES.getCode().equals(a.getIsFirst()) &&
-                                    StringUtils.isBlank(app.getAppCode())){
-                                return Boolean.TRUE;
-                            }
-                            return Boolean.FALSE;
-                        })
-                        .collect(Collectors.toList());
-
-                //如果筛选出来的 为空的话 就调用状态机
-                if(CollUtil.isEmpty(apps)){
-                    stateMachineUtils.pass(project);
-                    project.setUpdateOn(LocalDateTime.now());
-                    projectService.updateById(project);
-                }
+        //保存关系
+        app.setAppCode(appCode);
+        if(applicationService.updateById(app)){
+            /**
+             * 判断下 如果成功的话 那么判断下 这个项目的初次创建的app 是否都已经被注册
+             * 如果都已经注册 要调用状态机 进入下一个状态
+             */
+            List<ProjectApplication> apps = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
+                    .eq(ProjectApplication::getProjectId, project.getId()));
+            //筛选出 初次新建的app 但是没有appCode的
+            apps = apps.stream().filter(a -> {
+                        if(CommonEnum.YES.getCode().equals(a.getIsFirst()) &&
+                                StringUtils.isBlank(app.getAppCode())){
+                            return Boolean.TRUE;
+                        }
+                        return Boolean.FALSE;
+                    })
+                    .collect(Collectors.toList());
+
+            //如果筛选出来的 为空的话 就调用状态机
+            if(CollUtil.isEmpty(apps)){
+                stateMachineUtils.pass(project);
+                project.setUpdateOn(LocalDateTime.now());
+                projectService.updateById(project);
             }
         }