From d7fe8ae3888c8e2b1eea3c1e3769be0d42a21cc9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 十月 2023 09:03:47 +0800
Subject: [PATCH] Merge branch '1.0.3' of http://139.186.142.91:10010/r/productDev/dmMes into 1.0.3
---
server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java | 10 +++-------
1 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
index 6991000..c3ecd72 100644
--- a/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
+++ b/server/src/main/java/doumeemes/service/ext/impl/PlansExtServiceImpl.java
@@ -127,7 +127,7 @@
if(user.getProcedureIds()!=null){
pageWrap.setProcedureIds(user.getProcedureIds());
}else{
- pageWrap.setUserId(user.getId());
+ pageWrap.setCreateUser(user.getId());
}
List<PlansExtListVO> result = plansExtMapper.selectList(pageWrap);
if(result==null||result.size()==0){
@@ -190,12 +190,6 @@
pageWrap.getModel().setCreateUser(user.getId());
//鍚﹀垯璧版暟鎹潈闄�
pageWrap.getModel().setDepartIds(dataPermission);
- /* if(dataPermission.size() == 0){
- //鍙兘鐪嬭嚜宸辩殑
- pageWrap.getModel().setCreateUser(user.getId());
- }else{
-
- }*/
}
if(user.getProcedureIds()!=null){
pageWrap.getModel().setProcedureIds(user.getProcedureIds());
@@ -1617,6 +1611,8 @@
public void autoWorkReport(LoginUserInfo user, AutoWorkReportDTO autoWorkReportDTO){
if(Objects.isNull(autoWorkReportDTO)
|| Objects.isNull(autoWorkReportDTO.getCreateWorkorderRecordDTO())
+ || Objects.isNull(autoWorkReportDTO.getProUserList())
+ || Objects.isNull(autoWorkReportDTO.getProUserList().size()==0)
|| Objects.isNull(autoWorkReportDTO.getCreateWorkorderRecordDTO().getUnQualifiedNum())|| autoWorkReportDTO.getCreateWorkorderRecordDTO().getUnQualifiedNum().compareTo(BigDecimal.ZERO) < Constants.ZERO
|| Objects.isNull(autoWorkReportDTO.getCreateWorkorderRecordDTO().getQualifiedNum())|| autoWorkReportDTO.getCreateWorkorderRecordDTO().getQualifiedNum().compareTo(BigDecimal.ZERO) < Constants.ZERO){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
--
Gitblit v1.9.3