相关方入职离职

web-app/src/main/java/com/zcloud/basic/info/command/UserUpdateExe.java

@@ -234,6 +234,9 @@ public class UserUpdateExe {
         quitCmd.setId(userDO.getId());
         log.info("GBS离职处理开始,用户id:{},企业id:{}", userDO.getId(), corpinfoId);
         Response quit = userFacade.quit(quitCmd);
+        if(!quit.isSuccess()){
+            throw new IllegalArgumentException("GBS离职处理失败,用户id:"+userDO.getId()+",错误信息:"+quit.getErrMessage());
+        }
         log.info("GBS离职处理结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(quit));
     }
 
@@ -302,6 +305,9 @@ public class UserUpdateExe {
             UserUpdateQuitCmd quitCmd = new UserUpdateQuitCmd();
             quitCmd.setId(userDO.getId());
             Response quit = userFacade.quit(quitCmd);
+            if(!quit.isSuccess()){
+                throw new IllegalArgumentException("GBS离职处理失败,用户id:"+userDO.getId()+",错误信息:"+quit.getErrMessage());
+            }
             log.info("GBS离职处理结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(quit));
         } else {
             //驳回
@@ -374,7 +380,13 @@ public class UserUpdateExe {
             userAddCmd.setId(userDO.getId());
             log.info("GBS入职处理开始,用户id:{},请求参数:{}", userDO.getId(), JSONUtil.toJsonStr(userAddCmd));
             SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
+//            gbsResult.
             log.info("GBS入职处理结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(gbsResult));
+            if(!gbsResult.isSuccess()){
+                throw new IllegalArgumentException("GBS入职处理失败,用户id:"+userDO.getId()+",错误信息:"+gbsResult.getErrMessage());
+            }
+
+
             userDO.setId(gbsResult.getData());
 
         } else {

web-app/src/main/java/com/zcloud/basic/info/command/query/UserCorpRecordQueryExe.java

@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 /**
@@ -48,10 +49,19 @@ public class UserCorpRecordQueryExe {
      * @return
      */
     public PageResponse<UserCorpRecordCO> execute(UserCorpRecordPageQry userCorpRecordPageQry) {
-        if(userCorpRecordPageQry.getEqUserId() == null){
+
-            userCorpRecordPageQry.setEqUserId(AuthContext.getUserId());
+        Long userId = userCorpRecordPageQry.getEqUserId()==null?AuthContext.getUserId():userCorpRecordPageQry.getEqUserId();
+        UserDO userDO = userRepository.getById(userId);
+        if(userDO == null){
+            return PageResponse.of(null, 0, userCorpRecordPageQry.getPageSize(), userCorpRecordPageQry.getPageIndex());
         }
+
+        List<UserDO> userDOList = userRepository.getListByPhone(userDO.getPhone());
+        //获取id list
+        List<Long> userIdList = userDOList.stream().map(UserDO::getId).collect(Collectors.toList());
+        userCorpRecordPageQry.setEqUserId(null);
         Map<String, Object> params = PageQueryHelper.toHashMap(userCorpRecordPageQry);
+        params.put("inUserId", userIdList);
         PageResponse<UserCorpRecordDO> pageResponse = userCorpRecordRepository.listPage(params);
         List<UserCorpRecordCO> examCenterCOS = userCorpRecordCoConvertor.converDOsToCOs(pageResponse.getData());
         return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex());

web-infrastructure/src/main/java/com/zcloud/basic/info/persistence/repository/impl/UserRepositoryImpl.java

@@ -1,6 +1,7 @@
 package com.zcloud.basic.info.persistence.repository.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
 import com.alibaba.cola.dto.MultiResponse;
 import com.alibaba.cola.dto.PageResponse;
 import com.alibaba.cola.dto.Response;
@@ -271,8 +272,12 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
         List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
         userAddCmd.setRoleDepts(roleDeptAddCmdList);
-
+        log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd));
         SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
+        log.info("GBS新增用户结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
+        if (!gbsResult.isSuccess()) {
+            throw new RuntimeException("GBS新增用户失败,用户id:" + gbsResult.getData());
+        }
         userDO.setId(gbsResult.getData());
         if (userDO.getSort() == null) {
             userDO.setSort(9999);
@@ -329,7 +334,12 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         roleDeptAddCmd.setDeptId(userDO.getDepartmentId());
         List<RoleDeptAddCmd> roleDeptAddCmdList = Collections.singletonList(roleDeptAddCmd);
         userAddCmd.setRoleDepts(roleDeptAddCmdList);
+        log.info("GBS新增用户开始,用户信息:{}", JSONUtil.toJsonStr(userAddCmd));
         SingleResponse<Long> gbsResult = userFacade.add(userAddCmd);
+        log.info("GBS新增用户结束,用户id:{},结果:{}", gbsResult.getData(), JSONUtil.toJsonStr(gbsResult));
+        if (!gbsResult.isSuccess()) {
+            throw new RuntimeException("GBS新增用户失败,用户id:" + gbsResult.getData());
+        }
         userDO.setId(gbsResult.getData());
 
         if (userDO.getSort() == null) {
@@ -347,7 +357,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
         userUpdateCmd.setId(userDO.getId());
         userUpdateCmd.setAccount(userDO.getUsername());
         userUpdateCmd.setName(userDO.getName());
-        userFacade.update(userUpdateCmd);
+        log.info("GBS更新用户开始,用户信息:{}", JSONUtil.toJsonStr(userUpdateCmd));
+        Response response = userFacade.update(userUpdateCmd);
+        log.info("GBS更新用户结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(response));
     }
 
     @Override
@@ -402,7 +414,9 @@ public class UserRepositoryImpl extends BaseRepositoryImpl<UserMapper, UserDO> i
             userUpdateCmd.setId(userDO.getId());
             userUpdateCmd.setName(userDO.getName());
             userUpdateCmd.setAccount(userDO.getName());
-            userFacade.update(userUpdateCmd);
+            log.info("GBS更新用户开始,用户信息:{}", JSONUtil.toJsonStr(userUpdateCmd));
+            Response response = userFacade.update(userUpdateCmd);
+            log.info("GBS更新用户结束,用户id:{},结果:{}", userDO.getId(), JSONUtil.toJsonStr(response));
         }
     }
 

web-infrastructure/src/main/resources/mapper/UserMapper.xml

@@ -352,6 +352,7 @@
             #{item}
         </foreach>
         and ci.use_flag=1
+        and u.employment_flag =1
         and u.delete_enum = 'FALSE'
     </select>
 </mapper>