Merge branch 'develop_zyq' into 'develop'

Develop zyq

See merge request 8timerv2/8timerapiv200!400

src/main/java/cn/timer/api/controller/qyxx/CmsController.java

@@ -60,9 +60,6 @@ public class CmsController {
 	@Autowired
 	@Autowired
 	private CmsIsReadMapper cmsIsReadMapper;
 	private CmsIsReadMapper cmsIsReadMapper;
 
 
-	@Resource
-	private RedisUtil redisUtil;
-
 //	@Autowired
 //	@Autowired
 //	private CmsAnnouncementMapper cmsAnnouncementMapper;
 //	private CmsAnnouncementMapper cmsAnnouncementMapper;
 
 
@@ -92,13 +89,6 @@ public class CmsController {
 	@GetMapping(value = "/zxqyxx")
 	@GetMapping(value = "/zxqyxx")
 	@ApiOperation(value = "获取最新讯息的标题、发布时间", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "获取最新讯息的标题、发布时间", httpMethod = "GET", notes = "接口发布说明")
 	public Result<List<CmsContent>> groupbyTime(@CurrentUser UserBean userBean) {
 	public Result<List<CmsContent>> groupbyTime(@CurrentUser UserBean userBean) {
-//		new RedisUtil(new RedisTemplate<String, Object>()).set("1","2");
-		redisUtil.set("scien","123123123123333");
-		redisUtil.set("scien2","23");
-		redisUtil.set("scien3","3");
-		redisUtil.set("scien4","455");
-		redisUtil.set("scien133","455");
-		redisUtil.set("scien1111","455");
 		Integer orgCode = userBean.getOrgCode();
 		Integer orgCode = userBean.getOrgCode();
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<CmsContent> queryWrapper = new QueryWrapper<>();
 		queryWrapper.select("id", "title", "author", "releasetime", "fmtpath").eq("releasestate", 0)
 		queryWrapper.select("id", "title", "author", "releasetime", "fmtpath").eq("releasestate", 0)

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -8,6 +8,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.List;
 import java.util.Set;
 import java.util.Set;
 
 
+import cn.timer.api.dto.spmk.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.validation.annotation.Validated;
@@ -77,17 +78,6 @@ import cn.timer.api.dao.spmk.SpmkApproveSummaryMapper;
 import cn.timer.api.dao.spmk.SpmkCustomApprovalMapper;
 import cn.timer.api.dao.spmk.SpmkCustomApprovalMapper;
 import cn.timer.api.dao.spmk.SpmkExecutorMapper;
 import cn.timer.api.dao.spmk.SpmkExecutorMapper;
 import cn.timer.api.dao.spmk.SpmkInitiatorConfigMapper;
 import cn.timer.api.dao.spmk.SpmkInitiatorConfigMapper;
-import cn.timer.api.dto.spmk.ApprovedQuantityDto;
-import cn.timer.api.dto.spmk.ApprovingDto;
-import cn.timer.api.dto.spmk.FlowChildren;
-import cn.timer.api.dto.spmk.FromData;
-import cn.timer.api.dto.spmk.MySummaryQueryDto;
-import cn.timer.api.dto.spmk.Router;
-import cn.timer.api.dto.spmk.SpmkApprovalTemplateDto;
-import cn.timer.api.dto.spmk.SpmkApproveDetailDto;
-import cn.timer.api.dto.spmk.SpmkApproveSummaryDto;
-import cn.timer.api.dto.spmk.SpmkCustomApprovalDto;
-import cn.timer.api.dto.spmk.SummaryQueryDto;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.Result;
 import cn.timer.api.utils.ResultUtil;
 import cn.timer.api.utils.ResultUtil;
 import cn.timer.api.utils.router.RouterUtils;
 import cn.timer.api.utils.router.RouterUtils;
@@ -540,6 +530,14 @@ public class SpmkController {
 			Router router = spmkApproveSummaryDto.getRouter();
 			Router router = spmkApproveSummaryDto.getRouter();
 			List<Router> routers = router.getChildren();
 			List<Router> routers = router.getChildren();
 			if (CollectionUtil.isNotEmpty(routers)) {
 			if (CollectionUtil.isNotEmpty(routers)) {
+				boolean hasAudit=false;
+				if(routers.size()>0){
+					for (Relation relation:routers.get(0).getRelation()) {
+						if(relation.getUsers().size()>0){
+							hasAudit=true;
+						}
+					}
+				}
 //				List<Relation> relations = routers.get(0).getRelation();
 //				List<Relation> relations = routers.get(0).getRelation();
 //				if (relations == null || relations.size() < 1) {
 //				if (relations == null || relations.size() < 1) {
 //					return ResultUtil.error("无法发起，请完善审批流程");
 //					return ResultUtil.error("无法发起，请完善审批流程");
@@ -548,7 +546,9 @@ public class SpmkController {
 //				if (CollectionUtil.isEmpty(users)) {
 //				if (CollectionUtil.isEmpty(users)) {
 //					return ResultUtil.error("无法发起，请完善审批流程");
 //					return ResultUtil.error("无法发起，请完善审批流程");
 //				}
 //				}
-				
+				if(!hasAudit){
+					return ResultUtil.error("请选择审批人！");
+				}
 			}else {
 			}else {
 				return ResultUtil.error("无法发起，请完善审批流程");
 				return ResultUtil.error("无法发起，请完善审批流程");
 			}
 			}