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

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/controller/TzsUserInfoController.java

@@ -150,12 +150,14 @@ public class TzsUserInfoController extends BaseController {
         tzsUserInfo.setRecDate(new Date());
         String postName = tzsUserInfoServiceImpl.setPostName(tzsUserInfo.getPost());
         tzsUserInfo.setPostName(postName);
-        // 添加新的人员与组的关系
-        String[] split = postName.split(",");
-        List<String> ids = new ArrayList<>();
-        ids.add(selectOne.getAmosUserId());
-        for (String s : split) {
-            Privilege.groupUserClient.create(TwoStipulateGroupEnum.getId.get(s), ids);
+        if(!ObjectUtils.isEmpty(selectOne.getAmosUserId())){
+            // 添加新的人员与组的关系
+            String[] split = postName.split(",");
+            List<String> ids = new ArrayList<>();
+            ids.add(selectOne.getAmosUserId());
+            for (String s : split) {
+                Privilege.groupUserClient.create(TwoStipulateGroupEnum.getId.get(s), ids);
+            }
         }
         tzsUserInfoServiceImpl.updateById(tzsUserInfo);
 //        if (!ObjectUtils.isEmpty(list)){
@@ -329,7 +331,7 @@ public class TzsUserInfoController extends BaseController {
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
     @GetMapping(value = "/getGroupAndPersonInfo")
     @ApiOperation(httpMethod = "GET", value = "通过组id查询组及组内人员信息", notes = "通过组id查询组及组内人员信息")
     public ResponseModel<List<GroupAndPersonInfoDto>> getGroupAndPersonInfo(@RequestParam(value = "groupId") Long groupId) {

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -23,6 +23,7 @@ import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserInfoService;
 import com.yeejoin.amos.boot.module.tcm.api.vo.TzsUserInfoVo;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
+import com.yeejoin.amos.component.robot.AmosRequestContext;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
@@ -77,6 +78,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     private final String LOCK = "LOCK";
 
     @Autowired
+    AmosRequestContext amosRequestContext;
+
+    @Autowired
     private TzsUserQualificationsServiceImpl tzsUserQualificationsService;
 
     @Override
@@ -175,7 +179,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     public void deleteGroupAndPersonRelation(String postName, String amosUserId) {
         String[] split = postName.split(",");
         for (String s : split) {
-            Privilege.groupUserClient.deleteGroupUser(TwoStipulateGroupEnum.getId.get(s), amosUserId);
+            if(!ObjectUtils.isEmpty(TwoStipulateGroupEnum.getId.get(s))){
+                Privilege.groupUserClient.deleteGroupUser(TwoStipulateGroupEnum.getId.get(s), amosUserId);
+            }
         }
     }
 
@@ -448,6 +454,11 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
 
     @Override
     public List<GroupAndPersonInfoDto> getGroupAndPersonInfo(Long groupId) {
+
+        RequestContext.setProduct(amosRequestContext.getProduct());
+        RequestContext.setAppKey(amosRequestContext.getAppKey());
+        RequestContext.setToken(amosRequestContext.getToken());
+
         List<GroupAndPersonInfoDto> result = new ArrayList<>();
         List<AgencyUserModel> agencyUserModelList = Privilege.groupUserClient.queryForList(groupId).getResult();
         List<CompanyModel> companyModelList = Privilege.companyClient.queryForCompanyList(null, "company").getResult();