Merge branch 'dsc' into 'develop'

细节优化

See merge request 8timerv2/8timerapiv200!188

src/main/java/cn/timer/api/controller/crm/CrmController.java

@@ -965,9 +965,6 @@ public class CrmController {
 			List<Integer> members = getAllBusinessGroupMember(orgCode, groupId);
 			List<Integer> members = getAllBusinessGroupMember(orgCode, groupId);
 			for (Integer memberId : members) {
 			for (Integer memberId : members) {
 				Map<String, Object> map = selectMap(orgCode, memberId, status, startCreateTime, endCreateTime);
 				Map<String, Object> map = selectMap(orgCode, memberId, status, startCreateTime, endCreateTime);
-				if (memberId.equals(12414)) {
-					System.err.println("map++" + map);
-				}
 				if ((Integer) map.get("num") > 0) {
 				if ((Integer) map.get("num") > 0) {
 					list.add(map);
 					list.add(map);
 				}
 				}

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -305,7 +305,7 @@ public class YgglController {
 
 
 		if (ObjectUtil.isAllNotEmpty(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())
 		if (ObjectUtil.isAllNotEmpty(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())
 				&& !DateFormatUtils.getCompareDate(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())) {
 				&& !DateFormatUtils.getCompareDate(ygglMainEmp.getRzTime(), ygglMainEmp.getZzTime())) {
-			ResultUtil.error("入职日期 不可以大于 转正日期");
+			return ResultUtil.error("入职日期 不可以大于 转正日期");
 		}
 		}
 
 
 		if (ygglMainEmp.getEmpNum() != null) {
 		if (ygglMainEmp.getEmpNum() != null) {