Merge remote-tracking branch 'origin/developer' into developer

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/controller/LoginController.java

@@ -103,13 +103,22 @@ public class LoginController {
     public RestResponse allEnterprise(Integer userId){
         Object cache = RedisUtil.getCache("userEnterpriseList:" + userId);
         UserDTO userDTO = this.userApiService.getUser(userId).getResult();
+        List<UserDTO> userDTOList = this.userApiService.listUserByPhone(userDTO.getNationCode(), userDTO.getPhone()).getResult();
         List<EnterpriseDTO> enterpriseDTOList = (List<EnterpriseDTO>) cache;
         List<EnterpriseVo> result = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(enterpriseDTOList)){
             result = enterpriseDTOList.stream().map(enterpriseDTO -> {
                 EnterpriseVo vo = EntityUtil.changeEntityByJSON(EnterpriseVo.class, enterpriseDTO);
-                vo.setIsAdmin((userDTO != null && userDTO.getPhone().equals(enterpriseDTO.getPhoneNumber())) ? 1 : 0);
                 vo.setIsSingle("basic".equals(enterpriseDTO.getVersionCode()) ? 1 : 0);
+                if(CollectionUtils.isNotEmpty(userDTOList)){
+                    userDTOList.stream().forEach(user -> {
+                        if(user.getEnterpriseId().intValue() == enterpriseDTO.getEnterpriseId().intValue()){
+                            vo.setIsAdmin((user.getPhone().equals(enterpriseDTO.getPhoneNumber())) ? 1 : 0);
+                            vo.setUserName(user.getUserName());
+                            vo.setUserId(user.getUserId());
+                        }
+                    });
+                }
                 return vo;
             }).collect(Collectors.toList());
         }

gic-data-cloud-wxapp/src/main/java/com/gic/cloud/web/vo/EnterpriseVo.java

@@ -7,6 +7,7 @@ public class EnterpriseVo {
     private String companyName;
     private String logo;
     private String address;
+    private Integer userId;
     private String userName;
     private String phoneNumber;
     private String phoneAreaCode;
@@ -93,4 +94,12 @@ public class EnterpriseVo {
     public void setIsSingle(Integer isSingle) {
         this.isSingle = isSingle;
     }
+
+    public Integer getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Integer userId) {
+        this.userId = userId;
+    }
 }