From 5d2cfd4562f74496a5263db3451c1e78ff53aead Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期四, 27 三月 2025 08:44:16 +0800
Subject: [PATCH] 单据增加查询返回字段

---
 assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysLawServiceImpl.java |   31 +++++++++++++++++++++++++++----
 1 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysLawServiceImpl.java b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysLawServiceImpl.java
index 3981dcc..13a83e1 100644
--- a/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysLawServiceImpl.java
+++ b/assess-system/src/main/java/com/gkhy/assess/system/service/impl/SysLawServiceImpl.java
@@ -1,13 +1,15 @@
 package com.gkhy.assess.system.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gkhy.assess.common.api.CommonPage;
+import com.gkhy.assess.common.enums.DeleteFlagEnum;
 import com.gkhy.assess.common.exception.ApiException;
 import com.gkhy.assess.common.utils.PageUtil;
 import com.gkhy.assess.system.domain.SysLaw;
-import com.gkhy.assess.system.domain.SysNotice;
 import com.gkhy.assess.system.mapper.SysLawMapper;
 import com.gkhy.assess.system.service.SysLawService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gkhy.assess.system.utils.ShiroUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -38,6 +40,7 @@
     @Override
     public int addLaw(SysLaw law) {
         boolean b=save(law);
+        law.setCreateBy(ShiroUtils.getSysUser().getUsername());
         if(!b){
             throw new ApiException("新增法律法规失败");
         }
@@ -46,6 +49,7 @@
 
     @Override
     public int editLaw(SysLaw law) {
+        law.setUpdateBy(ShiroUtils.getSysUser().getUsername());
         boolean b=updateById(law);
         if(!b){
             throw new ApiException("修改法律法规失败");
@@ -55,7 +59,10 @@
 
     @Override
     public int deleteLawById(Long lawId) {
-        boolean b=removeById(lawId);
+        SysLaw sysLaw=new SysLaw().setId(lawId)
+                .setDelFlag(DeleteFlagEnum.DELETED.getCode());
+        sysLaw.setUpdateBy(ShiroUtils.getSysUser().getUsername());
+        boolean b=updateById(sysLaw);
         if(!b){
             throw new ApiException("删除法律法规失败");
         }
@@ -64,6 +71,22 @@
 
     @Override
     public int changeLawStatus(SysLaw law) {
-        return editLaw(law);
+        checkLawDataScope(law.getId());
+        SysLaw lw=new SysLaw().setId(law.getId()).setStatus(law.getStatus());
+        lw.setUpdateBy(ShiroUtils.getSysUser().getUsername());
+        return baseMapper.updateById(lw);
+    }
+
+    @Override
+    public SysLaw checkLawDataScope(Long lawId) {
+        if(lawId==null){
+            throw new ApiException("法律法规id为空!");
+        }
+        SysLaw law = baseMapper.getLawById(lawId);
+        if (ObjectUtil.isNull(law))
+        {
+            throw new ApiException("law数据不存在!");
+        }
+        return law;
     }
 }

--
Gitblit v1.9.2