Merge remote-tracking branch 'origin/master'

bs-common/src/main/java/com/rongwei/safecommon/config/CxCommonRunnerImpl.java

@@ -0,0 +1,27 @@
+package com.rongwei.safecommon.config;
+
+import com.rongwei.commonservice.service.RedisService;
+import com.rongwei.rwadmincommon.system.domain.SysOrganizationDo;
+import com.rongwei.rwadmincommon.system.service.SysOrganizationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+import java.util.List;
+
+@Component
+public class CxCommonRunnerImpl implements ApplicationRunner {
+
+    @Autowired
+    private SysOrganizationService sysOrganizationService;
+    @Autowired
+    private RedisService redisService;
+
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        System.out.println("服务启动公共初始化");
+        // 查询所有组织机构数据，并缓存到Redis中
+        List<SysOrganizationDo> orgdos = sysOrganizationService.list();
+        redisService.redisCatchInit("allOrgs",orgdos,0);
+    }
+}

rw-training/training-common/src/main/java/com/rongwei/trainingcommon/sys/service/impl/TrainingDemandServiceImpl.java

@@ -74,7 +74,7 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
         TrainingDemandSurveyDo trainingDemandSurveyDo = trainingDemandSurveyDao.selectById(id);
         if (trainingDemandSurveyDo == null) {
             log.error("无法通过id：{},获取到培训需求调查信息", trainingDemandSurveyDo);
-            return R.error(ERROR_MSG);
+            return R.error(String.format("%s元应为:%s", ERROR_MSG, "无法获取到问卷调查信息"));
         }
         if (RELEASE.equals(trainingDemandSurveyDo.getState())) {
             log.error("调查问卷 ：{}已发布无法再次发布", trainingDemandSurveyDo.getName());
@@ -83,10 +83,10 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
         List<DemandSurveyContentDo> saveDemandSurveyContentDos = new ArrayList<>();
         /******************************获取参与此次问卷的用户信息*********************************************/
         Set<String> participantUserId = getParticipantUser(trainingDemandSurveyDo);
-        log.info("参与本次温泉调查的员工数为:{}", participantUserId.size());
+        log.info("参与本次问卷调查的员工数为:{}", participantUserId.size());
         if (participantUserId.size() == 0) {
             log.error("本次问卷调查参与人数为0");
-            return R.error(ERROR_MSG);
+            return R.error(String.format("%s元应为:%s", ERROR_MSG, "暂无问卷参与人"));
         }
         /******************************开始复制业务数据*********************************************/
         // 调查问卷自定义信息
@@ -282,13 +282,19 @@ public class TrainingDemandServiceImpl implements TrainingDemandService {
         }
         // 参与培训的员工
         String participateuserid = trainingDemandSurveyDo.getParticipateuserid();
-        if (StringUtils.isNotBlank(participatedeptid)) {
-            participantUserIdList.addAll(Arrays.asList(participateuserid.split(",")));
+        if (StringUtils.isNotBlank(participateuserid)) {
+            String[] userIds = participateuserid.split(",");
+            for (int i = 0; i < userIds.length; i++) {
+                participantUserIdList.add(userIds[i]+"-;-"+trainingDemandSurveyDo.getParticipateusername().split(",")[i]);
+            }
         }
         // 排除的员工
         String excludeuserid = trainingDemandSurveyDo.getExcludeuserid();
         if (StringUtils.isNotBlank(excludeuserid)) {
-            participantUserIdList.removeAll(Arrays.asList(excludeuserid.split(",")));
+            String[] userIds = excludeuserid.split(",");
+            for (int i = 0; i < userIds.length; i++) {
+                participantUserIdList.remove(userIds[i]+"-;-"+trainingDemandSurveyDo.getExcludeusername().split(",")[i]);
+            }
         }
         return participantUserIdList;
     }