Merge branch 'developer' into 'master'

Developer

See merge request !6

gic-platform-auth-api/src/main/java/com/gic/auth/utils/ValidSplitUtils.java

@@ -11,7 +11,7 @@ import com.gic.api.base.commons.ServiceResponse;
 public class ValidSplitUtils {
 
     public static ServiceResponse<String[]> validStr(String param) {
-        if (isNumericZidai(param.replaceAll(",", ""))) {
+        if (!isNumericZidai(param.replaceAll(",", ""))) {
             return ServiceResponse.failure("0005", "数据格式有误，不是英文逗号隔开的数据");
         }
         String[] strArr = param.split(",");

gic-platform-auth-service/src/main/java/com/gic/auth/service/outer/impl/UserApiServiceImpl.java

@@ -22,10 +22,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
 
 /**
  * @author guojx
@@ -51,6 +50,8 @@ public class UserApiServiceImpl implements UserApiService {
     private AccountGroupRelService accountGroupRelService;
     @Autowired
     private AccountGroupService accountGroupService;
+    @Autowired
+    private AuditedGroupUserRelService auditedGroupUserRelService;
 
     @Transactional(rollbackFor = Exception.class)
     @Override
@@ -224,6 +225,11 @@ public class UserApiServiceImpl implements UserApiService {
             return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "用户类型错误，不是GIC管理员");
         }
         UserDTO result = EntityUtil.changeEntityNew(UserDTO.class, tabUser);
+        //受审组
+        List<Integer> userGroupIdList = auditedGroupUserRelService.listAuditedGroupByUserId(tabUser.getEnterpriseId(),
+                userId);
+        result.setUserGroupIds(Optional.ofNullable(userGroupIdList).orElse(new ArrayList<>()).stream()
+                .map(e -> e.toString()).collect(Collectors.joining(",")));
         //角色集
         List<UserRoleDTO> userRoleDTOList = userRoleService.listUserRoleByUserId(userId);
         StringBuilder userRoleStr = new StringBuilder();

gic-platform-auth-web/pom.xml

@@ -19,13 +19,6 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <libraryVersion>4.0-SNAPSHOT</libraryVersion>
-        <!-- api依赖，正式版会在 gic-pom-base 里生成 -->
-        <gic-store-api>4.0-SNAPSHOT</gic-store-api>
-        <gic-redis-data>4.0-SNAPSHOT</gic-redis-data>
-        <gic-marketing-api>4.0-SNAPSHOT</gic-marketing-api>
-        <gic-open-platform-api>4.0-SNAPSHOT</gic-open-platform-api>
-        <gic-member-config-api>4.0-SNAPSHOT</gic-member-config-api>
-        <gic-mall-share-api>4.0-SNAPSHOT</gic-mall-share-api>
     </properties>
 
     <dependencies>