lrj 5 місяців тому
батько
коміт
b26b206c60

+ 2 - 1
PCS/src/main/java/cn/cslg/permission/service/qiaobi/PersonRelationService.java

@@ -86,7 +86,7 @@ public class PersonRelationService extends ServiceImpl<PersonRelationMapper, Per
         if (personRelations == null | personRelations.isEmpty()) {
             return personnelVOS;
         }
-        List<Integer> personIds = personRelations.stream().map(PersonRelation::getPersonId1).collect(Collectors.toList());
+        List<Integer> personIds = personRelations.stream().map(PersonRelation::getPersonId2).collect(Collectors.toList());
         LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.in(Personnel::getId, personIds);
         List<Personnel> personnel = personnelService.list(queryWrapper);
@@ -94,6 +94,7 @@ public class PersonRelationService extends ServiceImpl<PersonRelationMapper, Per
             PersonnelVO personnelVO = new PersonnelVO();
             personnelVO.setMobile(item.getPersonnelPhone());
             personnelVO.setId(item.getId().toString());
+            personnelVO.setUsername(item.getPersonnelUserName());
             PersonRelation personRelation = personRelations.stream().filter(tem -> tem.getPersonId1().equals(item.getId())).findFirst().orElse(null);
             if (personRelation != null) {
                 personnelVO.setCreateTime(personRelation.getCreateTime());

+ 1 - 1
PCS/src/main/resources/application-prodNetOut.yml

@@ -29,7 +29,7 @@ spring:
         max-wait: -1ms
     timeout: 2000ms
   datasource:
-    url: jdbc:mysql://47.101.137.223:3306/PCS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
+    url: jdbc:mysql://139.224.34.118:3306/PCS_PROD?autoReconnect=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&useSSL=false&serverTimezone=GMT%2B8
     username: root
     password: TU5x6IeBi7rl
     driver-class-name: com.mysql.cj.jdbc.Driver