feat:user sync

ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java

@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: TODO
@@ -46,17 +47,32 @@ public class UserSyncKingdeeTask implements JobHandler {
     public String execute(String param) throws Exception {
         LambdaQueryWrapper<AdminUserDO> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AdminUserDO::getStatus, 0)
-                .eq(AdminUserDO::getIsSyncKingdee, 1);
+                .eq(AdminUserDO::getIsSyncKingdee, 1)
+                .eq(AdminUserDO::getCrmUserType, 1);
         List<AdminUserDO> users = userMapper.selectList(queryWrapper);
 
         List<AdminUserDO> errors = new ArrayList<>();
         for (AdminUserDO user : users) {
             doSyncUser(user, errors);
         }
+
+        List<Long> errorIds = errors.stream()
+                .map(AdminUserDO::getId)
+                .collect(Collectors.toList());
+
+        List<AdminUserDO> success = users.stream()
+                .filter(user -> !errorIds.contains(user.getId()))
+                .collect(Collectors.toList());
+
+
         if (!errors.isEmpty()) {
-            throw new AllKingdeeException("同步异常：" + errors);
+            return errors.stream()
+                    .map(user -> user.getUsername() + "_" + user.getNickname())
+                    .collect(Collectors.joining(", "));
         }
-        return "success";
+        return success.stream()
+                .map(user -> user.getUsername() + "_" + user.getNickname())
+                .collect(Collectors.joining(", "));
     }
 
     public void doSyncUser(AdminUserDO user, List<AdminUserDO> errors) throws AllKingdeeException, IOException, URISyntaxException {

ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/controller/admin/user/vo/user/UserSaveReqVO.java

@@ -97,6 +97,6 @@ public class UserSaveReqVO {
      * CRM职能
      * 枚举 {@link com.ensign.crm.framework.common.enums.CrmFunctionEnum}
      */
-    @Schema(description = "CRM职能", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "CRM职能", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     private Integer crmUserFunction;
 }