lixing il y a 4 ans
Parent
commit
7bfeb91699

+ 4 - 0
fm-person/src/main/java/com/persagy/fm/person/jms/handler/AccountMsgHandler.java

@@ -84,6 +84,10 @@ public class AccountMsgHandler {
         Person person = personService.queryByAccountId(accountUpdateMsg.getId());
         // 更新人员的账号信息
         if (person != null) {
+            // 避免因为先查后更新与其他事务发生冲突
+            String id = person.getId();
+            person = new Person();
+            person.setId(id);
             person.setUsername(accountUpdateMsg.getUsername());
             personService.updatePerson(person);
         }

+ 2 - 2
fm-person/src/main/java/com/persagy/fm/saas/project/client/SaasProjectClient.java

@@ -47,7 +47,7 @@ public interface SaasProjectClient {
      * @version V1.0 2021/3/26 5:46 下午
      */
     @PostMapping("/project/queryAreaProjectTree")
-    FmResponseContent<SaasAreaProjectTreeVO> queryAreaProjectTree(
+    FmResponseContent<List<SaasAreaProjectTreeVO>> queryAreaProjectTree(
              @RequestBody QuerySaasAreaProjectTreeDTO querySaasAreaProjectTreeDTO);
 
     /**
@@ -59,7 +59,7 @@ public interface SaasProjectClient {
      * @version V1.0 2021/3/29 6:17 下午
      */
     @PostMapping("/project/queryAllowAreaProjectTree")
-    FmResponseContent<SaasAreaProjectTreeVO> queryAllowAreaProjectTree(
+    FmResponseContent<List<SaasAreaProjectTreeVO>> queryAllowAreaProjectTree(
             @RequestBody QueryAllowSaasAreaProjectTreeDTO queryAllowSaasAreaProjectTreeDTO);
 
     /**

+ 8 - 4
fm-person/src/main/java/com/persagy/fm/saas/project/service/impl/SaasProjectServiceImpl.java

@@ -42,7 +42,7 @@ public class SaasProjectServiceImpl implements ISaasProjectService {
         QueryAllowSaasAreaProjectTreeDTO queryAllowSaasAreaProjectTreeDTO = new QueryAllowSaasAreaProjectTreeDTO();
         queryAllowSaasAreaProjectTreeDTO.setDefaultValue();
         queryAllowSaasAreaProjectTreeDTO.setProjectIds(projectIds);
-        FmResponseContent<SaasAreaProjectTreeVO> responseItem = saasProjectClient.queryAllowAreaProjectTree(queryAllowSaasAreaProjectTreeDTO);
+        FmResponseContent<List<SaasAreaProjectTreeVO>> responseItem = saasProjectClient.queryAllowAreaProjectTree(queryAllowSaasAreaProjectTreeDTO);
         // 查询结果转换
         return convert2ProjectTreeItemList(responseItem);
     }
@@ -52,7 +52,7 @@ public class SaasProjectServiceImpl implements ISaasProjectService {
         // 查询运维系统区域项目树
         QuerySaasAreaProjectTreeDTO querySaasAreaProjectTreeDTO = new QuerySaasAreaProjectTreeDTO();
         querySaasAreaProjectTreeDTO.setDefaultValue();
-        FmResponseContent<SaasAreaProjectTreeVO> responseContent = saasProjectClient.queryAreaProjectTree(querySaasAreaProjectTreeDTO);
+        FmResponseContent<List<SaasAreaProjectTreeVO>> responseContent = saasProjectClient.queryAreaProjectTree(querySaasAreaProjectTreeDTO);
         // 查询结果转换
         return convert2ProjectTreeItemList(responseContent);
     }
@@ -65,8 +65,12 @@ public class SaasProjectServiceImpl implements ISaasProjectService {
      * @author lixing
      * @version V1.0 2021/3/29 6:30 下午
      */
-    private List<ProjectTreeItemVO> convert2ProjectTreeItemList(FmResponseContent<SaasAreaProjectTreeVO> responseItem) {
-        SaasAreaProjectTreeVO saasAreaProjectTreeVO = responseItem.getContent();
+    private List<ProjectTreeItemVO> convert2ProjectTreeItemList(FmResponseContent<List<SaasAreaProjectTreeVO>> responseItem) {
+        List<SaasAreaProjectTreeVO> content = responseItem.getContent();
+        if (CollectionUtils.isEmpty(content)) {
+            return Lists.newArrayList();
+        }
+        SaasAreaProjectTreeVO saasAreaProjectTreeVO = content.get(0);
         if (saasAreaProjectTreeVO == null) {
             return Lists.newArrayList();
         }