From 7b8707bec5926c13ed63e2f682302a5c5132f36f Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Fri, 10 Jun 2022 11:52:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BA=E8=80=85=E6=9D=83=E9=99=90=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DummyInventoryBaseEOController.java       |  5 +-
 .../service/IDummyInventoryBaseEOService.java |  2 +-
 .../impl/DummyInventoryBaseEOServiceImpl.java | 63 ++++++++++++++++++-
 .../ocr/controller/OcrRecordEOController.java |  4 +-
 4 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
index cf08830ec..0e1fde1e9 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/controller/DummyInventoryBaseEOController.java
@@ -119,8 +119,9 @@ public class DummyInventoryBaseEOController extends JeroController<DummyInventor
 	@AutoLog(value = "虚拟清单基础表-通过id删除")
 	@ApiOperation(value="虚拟清单基础表-通过id删除", notes="虚拟清单基础表-通过id删除")
 	@DeleteMapping(value = "/delete")
-	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
-		dummyInventoryBaseEOService.deleteById(id);
+	public Result<?> delete(@RequestParam(name="id",required=true) String id,
+							@RequestParam(name="cut",required=true) String cut) {
+		dummyInventoryBaseEOService.deleteById(id,cut);
 		return Result.OK("删除成功!");
 	}
 
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
index 39ddbffd4..7879700ab 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/IDummyInventoryBaseEOService.java
@@ -44,7 +44,7 @@ public interface IDummyInventoryBaseEOService extends IService<DummyInventoryBas
 	 * @param id
 	 * @return
 	 */
-    void deleteById(String id);
+    void deleteById(String id,String cut);
 
 	/**
 	 * 批量删除
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index a95377c5c..00b97428c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -113,6 +113,26 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
      */
     @Override
     public void editById(DummyInventoryBaseEO dummyInventoryBaseEO) {
+        DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
+        List<String> createByNameList =new ArrayList<>();
+        if (StringUtils.isNotBlank(dummyInventoryBaseEO.getCreateBy())) {
+            createByNameList = Arrays.asList(dummyInventoryBaseEO.getCreateBy().split(","));
+
+            if (CollectionUtils.isNotEmpty(createByNameList)) {
+                // 增加创建者校验
+                LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+                String loginUserName = sysUser.getUsername();
+
+                if (!baseEO.getCreateBy().contains(loginUserName)) {
+                    if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
+                        throw new JeroBootException("当前用户非创建者,无法编辑");
+                    } else {
+                        throw new JeroBootException("The current user is not the creator and cannot be edited.");
+                    }
+                }
+            }
+        }
+
         Date now = new Date();
         dummyInventoryBaseEO.setUpdateTime(now);
         saveOrUpdate(dummyInventoryBaseEO);
@@ -127,7 +147,25 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
      * @return
      */
     @Override
-    public void deleteById(String id) {
+    public void deleteById(String id,String cut) {
+        // 创建者校验
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String loginUserName = sysUser.getUsername();
+
+        String createById = queryById(id).getCreateBy();
+        List<String> creatByIdList = Arrays.asList(createById.split(","));
+
+        if (CollectionUtils.isNotEmpty(creatByIdList)) {
+            for(String createBy : creatByIdList){
+                if (!loginUserName.equals(createBy)) {
+                    if (CutEnum.CN.getValue().equals(cut)) {
+                        throw new JeroBootException("当前用户非所有选择的数据的创建者,无法删除");
+                    }else{
+                        throw new JeroBootException("The current user is not the creator of all selected data, and cannot be deleted.");
+                    }
+                }
+            }
+        }
         removeById(id);
     }
 
@@ -247,7 +285,27 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
     @Override
     @Transactional
     public void issue(DummyInventoryBaseEO dummyInventoryBaseEO){
-        this.updateById(dummyInventoryBaseEO);
+        // 增加创建者校验
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        String loginUserName = sysUser.getUsername();
+
+        DummyInventoryBaseEO baseEO = queryById(dummyInventoryBaseEO.getId());
+        List<String> createByNameList =new ArrayList<>();
+        if (StringUtils.isNotBlank(baseEO.getCreateBy())) {
+            createByNameList = Arrays.asList(baseEO.getCreateBy().split(","));
+
+            if (CollectionUtils.isNotEmpty(createByNameList)){
+                if (!createByNameList.contains(loginUserName)) {
+                    if (CutEnum.CN.getValue().equals(dummyInventoryBaseEO.getCut())) {
+                        throw new JeroBootException("当前用户非创建者,无法发布");
+                    } else {
+                        throw new JeroBootException("The current user is not the creator and cannot be issued.");
+                    }
+                }
+            }
+        }
+
+//        this.updateById(dummyInventoryBaseEO);
         //不管有没有维护清单,都返回操作成功
         //发布与撤回均需要发消息(向订阅的人员发消息)
         //首次发布不发消息
@@ -351,7 +409,6 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                             //向订阅该领域管理的人发消息和飞书
                             sendMsg(baseDiff, dummyContentChangeEOBaseList.get(0).getConnectId(), contentLog,dummyInventoryBaseEO.getState(),dummyInventoryBaseEO.getCut());
 
-                            LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
                             //5.数据对比完成后.更新之前保存的dummy_inventory_info中的content_json数据,重新保存最新的数据
                             if(MapUtils.isNotEmpty(baseDiff)){//列表有不同字段
                                 String base = JSONArray.toJSONString(dummyInventoryBaseEOList);
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
index b246489ea..64ae619f3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ocr/controller/OcrRecordEOController.java
@@ -263,9 +263,9 @@ public class OcrRecordEOController extends JeroController<OcrRecordEO, IOcrRecor
 
 		}else {
 			if (CutEnum.CN.getValue().equals(cut)) {
-				return Result.error("当前用户非创建者,无法下载");
+				return Result.error("当前用户非创建者,无法删除");
 			}else{
-				return Result.error("The current user is not the creator and cannot be downloaded.");
+				return Result.error("The current user is not the creator and cannot be deleted.");
 			}
 		}
 	}