修复

src/main/java/org/springblade/bank/cardswallow/controller/CardSwallowController.java

@@ -59,6 +59,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -164,26 +165,25 @@ public class CardSwallowController extends BladeController {
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		List<Long> idList = Func.toLongList(ids);
 
-		if (cardSwallowService.deleteLogic(idList)){
-			// 日誌記錄
-			BladeUser currentUser = AuthUtil.getUser();
-			User user = userService.getById(currentUser.getUserId());
-			Dept dept = deptService.getById(user.getDeptId());
-			idList.forEach(id -> {
-				UserLog userLog = new UserLog();
-				CardSwallow cardSwallow = cardSwallowService.getById(id);
-
-				userLog.setTableName("cardswallow");
-				userLog.setOperationType("del");
-				userLog.setBankNo(dept.getBankNo());
-				userLog.setOrgNo(dept.getOrgNo());
-				userLog.setOldData(JSONUtil.toJsonStr(cardSwallow));
-				userLog.setPersonNo(user.getEhr());
-				userLog.setPersonName(user.getName());
-				userLogService.save(userLog);
-			});
-		}
-		return R.status(true);
+		List<UserLog> userLogList = new ArrayList<>();
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			CardSwallow cardSwallow = cardSwallowService.getById(id);
+			userLog.setTableName("cardswallow");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(cardSwallow));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+
+		return R.status(cardSwallowService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 	/**
@@ -304,7 +304,7 @@ public class CardSwallowController extends BladeController {
 			userLog.setPersonName(user.getName());
 
 			if (isAdd){
-				userLog.setOperationType("add");
+				userLog.setOperationType("upload");
 			}else{
 				userLog.setOperationType("edit");
 				userLog.setOldData(JSONUtil.toJsonStr(old));

src/main/java/org/springblade/bank/checklist/controller/ChecklistController.java

@@ -197,26 +197,26 @@ public class ChecklistController extends BladeController {
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
 
-		if (checklistService.deleteLogic(idList)){
-			// 日誌記錄
-			BladeUser currentUser = AuthUtil.getUser();
-			User user = userService.getById(currentUser.getUserId());
-			Dept dept = deptService.getById(user.getDeptId());
-			idList.forEach(id -> {
-				UserLog userLog = new UserLog();
-				Checklist checklist = checklistService.getById(id);
-				userLog.setTableName("checklist");
-				userLog.setOperationType("del");
-				userLog.setBankNo(dept.getBankNo());
-				userLog.setOrgNo(dept.getOrgNo());
-				userLog.setOldData(JSONUtil.toJsonStr(checklist));
-				userLog.setPersonNo(user.getEhr());
-				userLog.setPersonName(user.getName());
-				userLogService.save(userLog);
-			});
-		}
-		return R.status(true);
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			Checklist checklist = checklistService.getById(id);
+			userLog.setTableName("checklist");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(checklist));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+
+		return R.status(checklistService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 	/**

src/main/java/org/springblade/bank/goodsuse/controller/GoodsUseController.java

@@ -164,9 +164,9 @@ public class GoodsUseController extends BladeController {
 			goodsUse.setPersonName(setting.getPersonName());
 		}
 
-		if (StringUtils.isNotBlank(goodsUse.getPersonNo())){
+		if (StringUtils.isNotBlank(goodsUse.getFillingNo())){
 			User user = userService.getById(AuthUtil.getUser().getUserId());
-			Assert.isTrue(!user.getEhr().equals(goodsUse.getPersonNo()), "確認人和發起人不能為同一人！");
+			Assert.isTrue(!user.getEhr().equals(goodsUse.getFillingNo()), "確認人和發起人不能為同一人！");
 		}
 		goodsUse.setProcess(2);
 
@@ -215,27 +215,27 @@ public class GoodsUseController extends BladeController {
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
 
-		if (goodsUseService.deleteLogic(idList)){
-			// 日誌記錄
-			BladeUser currentUser = AuthUtil.getUser();
-			User user = userService.getById(currentUser.getUserId());
-			Dept dept = deptService.getById(user.getDeptId());
-			idList.forEach(id -> {
-				UserLog userLog = new UserLog();
-				GoodsUse goodsUse = goodsUseService.getById(id);
-
-				userLog.setTableName("goodsuse");
-				userLog.setOperationType("del");
-				userLog.setBankNo(dept.getBankNo());
-				userLog.setOrgNo(dept.getOrgNo());
-				userLog.setOldData(JSONUtil.toJsonStr(goodsUse));
-				userLog.setPersonNo(user.getEhr());
-				userLog.setPersonName(user.getName());
-				userLogService.save(userLog);
-			});
-		}
-		return R.status(true);
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			GoodsUse goodsUse = goodsUseService.getById(id);
+
+			userLog.setTableName("goodsuse");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(goodsUse));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+		
+		return R.status(goodsUseService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 	/**
@@ -302,8 +302,8 @@ public class GoodsUseController extends BladeController {
 		goodsUse.setProcess(3);
 
 		User user = userService.getById(AuthUtil.getUser().getUserId());
-		if (StringUtils.isNotBlank(goodsUse.getPersonNo())){
-			Assert.isTrue(!user.getEhr().equals(goodsUse.getPersonNo()), "確認人和發起人不能為同一人！");
+		if (StringUtils.isNotBlank(goodsUse.getFillingNo())){
+			Assert.isTrue(!user.getEhr().equals(goodsUse.getFillingNo()), "確認人和發起人不能為同一人！");
 		}
 
 		goodsUse.setApproveTime(DateUtil.now());

src/main/java/org/springblade/bank/goodsuse/entity/GoodsUse.java

@@ -94,6 +94,11 @@ public class GoodsUse extends BaseEntity {
 		@ApiModelProperty(value = "結束編號")
 		private String endNo;
 	/**
+	* 上日餘額
+	*/
+		@ApiModelProperty(value = "上日餘額")
+		private Integer lastBalance;
+	/**
 	* 餘額
 	*/
 		@ApiModelProperty(value = "餘額")

src/main/java/org/springblade/bank/goodsuse/mapper/GoodsUseMapper.xml

@@ -21,6 +21,7 @@
         <result column="write_off_number" property="writeOffNumber"/>
         <result column="begin_no" property="beginNo"/>
         <result column="end_no" property="endNo"/>
+        <result column="last_balance" property="lastBalance"/>
         <result column="balance" property="balance"/>
         <result column="remark" property="remark"/>
         <result column="filling_no" property="fillingNo"/>

src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -48,10 +48,7 @@ import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 網點鎖匙/密碼登記表 控制器
@@ -224,27 +221,27 @@ public class KeyPwdController extends BladeController {
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
 
-		if (keyPwdService.deleteLogic(idList)){
-			// 日誌記錄
-			BladeUser currentUser = AuthUtil.getUser();
-			User user = userService.getById(currentUser.getUserId());
-			Dept dept = deptService.getById(user.getDeptId());
-			idList.forEach(id -> {
-				UserLog userLog = new UserLog();
-				KeyPwd keyPwd = keyPwdService.getById(id);
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			KeyPwd keyPwd = keyPwdService.getById(id);
 
-				userLog.setTableName("keypwd");
-				userLog.setOperationType("del");
-				userLog.setBankNo(dept.getBankNo());
-				userLog.setOrgNo(dept.getOrgNo());
-				userLog.setOldData(JSONUtil.toJsonStr(keyPwd));
-				userLog.setPersonNo(user.getEhr());
-				userLog.setPersonName(user.getName());
-				userLogService.save(userLog);
-			});
-		}
-		return R.status(true);
+			userLog.setTableName("keypwd");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(keyPwd));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+
+		return R.status(keyPwdService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 	/**

src/main/java/org/springblade/bank/message/controller/MessageController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.bank.message.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -24,14 +25,22 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import org.springblade.bank.checklist.entity.Checklist;
+import org.springblade.bank.userlog.entity.UserLog;
+import org.springblade.bank.userlog.service.IUserLogService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.resource.entity.Attach;
 import org.springblade.modules.resource.service.IAttachService;
 import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserService;
 import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -42,6 +51,9 @@ import org.springblade.bank.message.wrapper.MessageWrapper;
 import org.springblade.bank.message.service.IMessageService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 信息發佈 控制器
  *
@@ -57,6 +69,8 @@ public class MessageController extends BladeController {
 	private final IMessageService messageService;
 	private final IAttachService attachService;
 	private final IDeptService deptService;
+	private final IUserService userService;
+	private final IUserLogService userLogService;
 
 	/**
 	 * 详情
@@ -127,12 +141,37 @@ public class MessageController extends BladeController {
 		message.setExtension(attach.getExtension());
 		message.setAttachSize(attach.getAttachSize());
 
-		if (messageService.saveOrUpdate(message)){
+		boolean isAdd = message.getId() == null;
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		UserLog userLog = new UserLog();
+		Message old = null;
+		if (isAdd){
+			messageService.save(message);
 			message.setCreateDept(message.getDeptId());
-			return R.status(messageService.saveOrUpdate(message));
+		}else{
+			old = messageService.getById(message.getId());
+		}
+
+		if (messageService.saveOrUpdate(message)){
+			userLog.setTableName("message");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setNewData(JSONUtil.toJsonStr(message));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+
+			if (isAdd){
+				userLog.setOperationType("add");
+			}else{
+				userLog.setOperationType("edit");
+				userLog.setOldData(JSONUtil.toJsonStr(old));
+			}
+			userLogService.save(userLog);
 		}
 
-		return R.status(false);
+		return R.status(true);
 	}
 
 
@@ -143,7 +182,28 @@ public class MessageController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(messageService.deleteLogic(Func.toLongList(ids)));
+
+		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
+
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			Message message = messageService.getById(id);
+			userLog.setTableName("message");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(message));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+
+		return R.status(messageService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 

src/main/java/org/springblade/bank/postchange/controller/PostChangeController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.bank.postchange.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import io.swagger.annotations.Api;
@@ -26,10 +27,16 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.apache.commons.lang.StringUtils;
+import org.springblade.bank.goodsuse.entity.GoodsUse;
+import org.springblade.bank.message.entity.Message;
+import org.springblade.bank.userlog.entity.UserLog;
+import org.springblade.bank.userlog.service.IUserLogService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.User;
@@ -45,6 +52,7 @@ import org.springblade.bank.postchange.wrapper.PostChangeWrapper;
 import org.springblade.bank.postchange.service.IPostChangeService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -62,6 +70,7 @@ public class PostChangeController extends BladeController {
 	private final IPostChangeService postChangeService;
 	private final IUserService userService;
 	private final IDeptService deptService;
+	private final IUserLogService userLogService;
 
 	/**
 	 * 详情
@@ -134,10 +143,7 @@ public class PostChangeController extends BladeController {
 				Assert.notNull(null, "發佈人和發起人不能為同一人！");
 			}
 		}
-
-
 		postChange.setProcess(2);
-
 		PostChange last = postChangeService.getLastRecord();
 		if (last != null){
 			//上一条记录
@@ -145,7 +151,36 @@ public class PostChangeController extends BladeController {
 		}
 		postChange.setIsCompleted(0);
 
-		return R.status(postChangeService.save(postChange));
+		boolean isAdd = postChange.getId() == null;
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		UserLog userLog = new UserLog();
+
+		PostChange old = null;
+		if (isAdd){
+		}else{
+			old = postChangeService.getById(postChange.getId());
+		}
+
+		if (postChangeService.saveOrUpdate(postChange)){
+			userLog.setTableName("postchange");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setNewData(JSONUtil.toJsonStr(postChange));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+
+			if (isAdd){
+				userLog.setOperationType("add");
+			}else{
+				userLog.setOperationType("edit");
+				userLog.setOldData(JSONUtil.toJsonStr(old));
+			}
+			userLogService.save(userLog);
+		}
+
+		return R.status(true);
 	}
 
 
@@ -156,7 +191,27 @@ public class PostChangeController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(postChangeService.deleteLogic(Func.toLongList(ids)));
+		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
+
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			PostChange postchange = postChangeService.getById(id);
+			userLog.setTableName("postchange");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(postchange));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+
+		return R.status(postChangeService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 	/**

src/main/java/org/springblade/bank/returns/controller/ReturnsController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.bank.returns.controller;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -28,12 +29,16 @@ import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springblade.bank.cardswallow.entity.CardSwallow;
+import org.springblade.bank.checklist.entity.Checklist;
 import org.springblade.bank.postchange.entity.PostChange;
 import org.springblade.bank.returns.entity.Returns;
 import org.springblade.bank.returns.entity.ReturnsExcel;
 import org.springblade.bank.returns.service.IReturnsService;
 import org.springblade.bank.returns.vo.ReturnsVO;
 import org.springblade.bank.returns.wrapper.ReturnsWrapper;
+import org.springblade.bank.sealhandover.entity.SealHandover;
+import org.springblade.bank.userlog.entity.UserLog;
+import org.springblade.bank.userlog.service.IUserLogService;
 import org.springblade.common.utils.MyExcelUtil;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.excel.util.ExcelUtil;
@@ -56,6 +61,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -73,6 +79,7 @@ public class ReturnsController extends BladeController {
 	private final IReturnsService returnsService;
 	private final IDeptService deptService;
 	private final IUserService userService;
+	private final IUserLogService userLogService;
 
 	/**
 	 * 详情
@@ -141,7 +148,39 @@ public class ReturnsController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入returns")
 	public R submit(@Valid @RequestBody Returns returns) {
-		return R.status(returnsService.saveOrUpdate(returns));
+
+		boolean isAdd = returns.getId() == null;
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		UserLog userLog = new UserLog();
+
+		Returns old = null;
+		if (isAdd){
+		}else{
+			old = returnsService.getById(returns.getId());
+		}
+
+		if (returnsService.saveOrUpdate(returns)){
+			userLog.setTableName("returns");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setNewData(JSONUtil.toJsonStr(returns));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+
+			if (isAdd){
+				userLog.setOperationType("upload");
+			}else{
+				userLog.setOperationType("edit");
+
+				userLog.setOldData(JSONUtil.toJsonStr(old));
+			}
+			userLogService.save(userLog);
+
+		}
+
+		return R.status(true);
 	}
 
 
@@ -152,7 +191,27 @@ public class ReturnsController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(returnsService.deleteLogic(Func.toLongList(ids)));
+		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
+
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			Returns returns = returnsService.getById(id);
+			userLog.setTableName("returns");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(returns));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+
+		return R.status(returnsService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 	/**

src/main/java/org/springblade/bank/sealhandover/controller/SealHandoverController.java

@@ -52,10 +52,7 @@ import org.springblade.bank.sealhandover.wrapper.SealHandoverWrapper;
 import org.springblade.bank.sealhandover.service.ISealHandoverService;
 import org.springblade.core.boot.ctrl.BladeController;
 
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 業務印章交接登記表 控制器
@@ -264,27 +261,26 @@ public class SealHandoverController extends BladeController {
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			SealHandover sealHandover = sealHandoverService.getById(id);
 
-		if (sealHandoverService.deleteLogic(idList)){
-			// 日誌記錄
-			BladeUser currentUser = AuthUtil.getUser();
-			User user = userService.getById(currentUser.getUserId());
-			Dept dept = deptService.getById(user.getDeptId());
-			idList.forEach(id -> {
-				UserLog userLog = new UserLog();
-				SealHandover sealHandover = sealHandoverService.getById(id);
+			userLog.setTableName("sealhandover");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(sealHandover));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
 
-				userLog.setTableName("sealhandover");
-				userLog.setOperationType("del");
-				userLog.setBankNo(dept.getBankNo());
-				userLog.setOrgNo(dept.getOrgNo());
-				userLog.setOldData(JSONUtil.toJsonStr(sealHandover));
-				userLog.setPersonNo(user.getEhr());
-				userLog.setPersonName(user.getName());
-				userLogService.save(userLog);
-			});
-		}
-		return R.status(true);
+		return R.status(sealHandoverService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 	/**

src/main/java/org/springblade/bank/tellertrunk/controller/TellerTrunkController.java

@@ -49,6 +49,7 @@ import org.springblade.bank.tellertrunk.wrapper.TellerTrunkWrapper;
 import org.springblade.bank.tellertrunk.service.ITellerTrunkService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -184,27 +185,27 @@ public class TellerTrunkController extends BladeController {
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
 
-		if (tellerTrunkService.deleteLogic(idList)){
-			// 日誌記錄
-			BladeUser currentUser = AuthUtil.getUser();
-			User user = userService.getById(currentUser.getUserId());
-			Dept dept = deptService.getById(user.getDeptId());
-			idList.forEach(id -> {
-				UserLog userLog = new UserLog();
-				TellerTrunk tellerTrunk = tellerTrunkService.getById(id);
-
-				userLog.setTableName("tellertrunk");
-				userLog.setOperationType("del");
-				userLog.setBankNo(dept.getBankNo());
-				userLog.setOrgNo(dept.getOrgNo());
-				userLog.setOldData(JSONUtil.toJsonStr(tellerTrunk));
-				userLog.setPersonNo(user.getEhr());
-				userLog.setPersonName(user.getName());
-				userLogService.save(userLog);
-			});
-		}
-		return R.status(true);
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			TellerTrunk tellerTrunk = tellerTrunkService.getById(id);
+
+			userLog.setTableName("tellertrunk");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(tellerTrunk));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+
+		return R.status(tellerTrunkService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 

src/main/java/org/springblade/bank/warehouse/controller/CheckWarehouseController.java

@@ -25,6 +25,7 @@ import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
 import org.apache.commons.lang.StringUtils;
+import org.springblade.bank.checklist.entity.Checklist;
 import org.springblade.bank.tellertrunk.entity.TellerTrunk;
 import org.springblade.bank.userlog.entity.UserLog;
 import org.springblade.bank.userlog.service.IUserLogService;
@@ -48,6 +49,7 @@ import org.springblade.bank.warehouse.wrapper.CheckWarehouseWrapper;
 import org.springblade.bank.warehouse.service.ICheckWarehouseService;
 import org.springblade.core.boot.ctrl.BladeController;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -183,7 +185,28 @@ public class CheckWarehouseController extends BladeController {
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "逻辑删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-		return R.status(checkWarehouseService.deleteLogic(Func.toLongList(ids)));
+
+		List<Long> idList = Func.toLongList(ids);
+		List<UserLog> userLogList = new ArrayList<>();
+
+		// 日誌記錄
+		BladeUser currentUser = AuthUtil.getUser();
+		User user = userService.getById(currentUser.getUserId());
+		Dept dept = deptService.getById(user.getDeptId());
+		idList.forEach(id -> {
+			UserLog userLog = new UserLog();
+			CheckWarehouse warehouse = checkWarehouseService.getById(id);
+			userLog.setTableName("checkwarehouse");
+			userLog.setOperationType("del");
+			userLog.setBankNo(dept.getBankNo());
+			userLog.setOrgNo(dept.getOrgNo());
+			userLog.setOldData(JSONUtil.toJsonStr(warehouse));
+			userLog.setPersonNo(user.getEhr());
+			userLog.setPersonName(user.getName());
+			userLogList.add(userLog);
+		});
+
+		return R.status(checkWarehouseService.deleteLogic(idList) && userLogService.saveBatch(userLogList));
 	}
 
 

src/main/java/org/springblade/modules/system/controller/DeptController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.system.controller;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
@@ -38,9 +39,12 @@ import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.support.Kv;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.IUserService;
 import org.springblade.modules.system.vo.DeptVO;
 import org.springblade.modules.system.wrapper.DeptWrapper;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -64,6 +68,7 @@ import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 public class DeptController extends BladeController {
 
 	private final IDeptService deptService;
+	private final IUserService userService;
 
 	/**
 	 * 详情
@@ -162,6 +167,11 @@ public class DeptController extends BladeController {
 	@ApiOperation(value = "删除", notes = "传入ids")
 	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
 		CacheUtil.clear(SYS_CACHE);
+		List<String> idList = Func.toStrList(ids);
+		idList.forEach(deptId -> {
+			List<User> list = userService.list(new QueryWrapper<>(new User()).lambda().eq(User::getDeptId, deptId));
+			Assert.isTrue(!(list.size() > 0), "該機構下還有用戶，請先將相關用戶處理之後，再操作！");
+		});
 		return R.status(deptService.removeDept(ids));
 	}