Merge branch 'master' of http://111.203.232.171:8888/zhutianwei/tianjin-cement

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PlanTrainingServiceImpl.java

@@ -159,11 +159,12 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
 		boolean remove = iPlantPeopleService.remove(qw);
 		if (remove) {
 			Integer planId = update.getId();
+			List<PlanPeople> batchAdd = new ArrayList<>();
 			//todo 培训关联表对象  ==>plant + 基本用户信息
 			//拆分用户id
 			String userIds = planTrainingQuery.getUserIds();
 			String[] split = userIds.split("、");
-			List<PlanPeople> batchAdd = new ArrayList<>();
+			if (planTrainingQuery.getUserIds()!=null) {
 				//为每个用户id创建关联表信息s
 				for (String userId : split) {
 					Integer id = Integer.parseInt(userId);
@@ -178,7 +179,9 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
 					batchAdd.add(planPeople);
 					update.setPlanObject(update.getPlanObject() + user.getName() + "、");
 				}
+			}
 
+			if (planTrainingQuery.getGroupIds()!=null) {
 				//传的GroupIds
 				String groupIds = planTrainingQuery.getGroupIds();
 				String[] split1 = groupIds.split("、");
@@ -197,6 +200,8 @@ public class PlanTrainingServiceImpl extends ServiceImpl<PlanTrainingMapper, Pla
 						planPeople.setGroupId(user.getGroupId());
 
 						batchAdd.add(planPeople);
+						update.setPlanObject(update.getPlanObject() + user.getName() + "、");
+					}
 				}
 			}
 			iPlantPeopleService.saveBatch(batchAdd);

cement-business/src/main/resources/application.yml

@@ -7,8 +7,8 @@ spring:
     active: dev
   datasource:
     # 192.168.110.85   admin!@#123
-#    url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
-    url: jdbc:mysql://81.68.92.175:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
+    #url: jdbc:mysql://81.68.92.175:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: admin!@#123
     driverClassName: com.mysql.cj.jdbc.Driver