1.报表打印接口权限去掉

2.用户列表接口增加公司权限
3.主单提交请核，主单，分单费用明细审核状态未更新bug修改
4.主单审核通过，分单审核状态未同步bug修改
5.费用请核判断存在多种外币金额不能请核
6.分单数量复制和撤销分单添加到主单接口计算bug修改
7.审核通过以后，保存单据后，审核状态覆盖bug修改
8.首页完成率-OW（拿）（放），日期查询数据不对

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/controller/ReportsController.java

@@ -86,7 +86,7 @@ public class ReportsController extends BladeController {
 		} else {
 			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(reports.getClassifyCode()), Reports::getClassifyCode, reports.getClassifyCode());
 		}
-		if (!AuthUtil.getUserRole().contains("admin")) {
+		/*if (!AuthUtil.getUserRole().contains("admin")) {
 			String roleIds = AuthUtil.getUser().getRoleId();
 			StringBuilder text = new StringBuilder("(");
 			String[] arr = roleIds.split(",");
@@ -109,7 +109,7 @@ public class ReportsController extends BladeController {
 			text.append("find_in_set('").append(AuthUtil.getUserId()).append("',authorized_users_id) or  ");
 			text.append(" not find_in_set('").append(AuthUtil.getUserId()).append("',exclude_users_id))");
 			lambdaQueryWrapper.apply(text.toString());
-		}
+		}*/
 		IPage<Reports> pages = reportsService.page(Condition.getPage(query), lambdaQueryWrapper);
 		return R.data(pages);
 	}

blade-service/blade-los/src/main/java/org/springblade/los/basic/reports/service/impl/ReportsServiceImpl.java

@@ -2025,7 +2025,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			if (MagicValues.D.equals(item.getDc())) {
 				if (!exrateType.equals(item.getCurCode())) {
 					amountDrUsd = amountDrUsd.add(item.getAmount());
-					amountDrLoc = amountDrLoc.add(currencyUtils.converter(item.getDc(), curExrateList, item.getAmount(), item.getCurCode(), "1"));
+					amountDrLoc = amountDrLoc.add(item.getAmount().multiply(item.getExrate()));
 				} else {
 					amountDr = amountDr.add(item.getAmount());
 					amountDrLoc = amountDrLoc.add(item.getAmount());
@@ -2033,7 +2033,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			} else {
 				if (!exrateType.equals(item.getCurCode())) {
 					amountCrUsd = amountCrUsd.add(item.getAmount());
-					amountCrLoc = amountCrLoc.add(currencyUtils.converter(item.getDc(), curExrateList, item.getAmount(), item.getCurCode(), "1"));
+					amountCrLoc = amountCrLoc.add(item.getAmount().multiply(item.getExrate()));
 				} else {
 					amountCr = amountCr.add(item.getAmount());
 					amountCrLoc = amountCrLoc.add(item.getAmount());

blade-service/blade-los/src/main/java/org/springblade/los/box/controller/TradingBoxController.java

@@ -111,8 +111,8 @@ public class TradingBoxController extends BladeController {
 		;
 		if (ObjectUtils.isNotNull(tradingBox.getEffectiveDate()) && ObjectUtils.isNotNull(tradingBox.getExpiryDate())) {
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
-			lambdaQueryWrapper.apply(ObjectUtils.isNotNull(tradingBox.getEffectiveDate()), "DATE_FORMAT(effective_date,'%Y-%m-%d') >= '" + formatter.format(tradingBox.getEffectiveDate()) + "'")
-				.apply(ObjectUtils.isNotNull(tradingBox.getExpiryDate()), "DATE_FORMAT(expiry_date,'%Y-%m-%d') <= '" + formatter.format(tradingBox.getExpiryDate()) + "'");
+			lambdaQueryWrapper.apply(ObjectUtils.isNotNull(tradingBox.getEffectiveDate()), "DATE_FORMAT(effective_date,'%Y-%m-%d') <= '" + formatter.format(tradingBox.getEffectiveDate()) + "'")
+				.apply(ObjectUtils.isNotNull(tradingBox.getExpiryDate()), "DATE_FORMAT(expiry_date,'%Y-%m-%d') >= '" + formatter.format(tradingBox.getExpiryDate()) + "'");
 		}
 		if (tradingBox.getPurchaseDateList() != null && tradingBox.getPurchaseDateList().size() > 1) {
 			lambdaQueryWrapper.ge(TradingBox::getPurchaseDate, tradingBox.getPurchaseDateList().get(0));

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/ExpenseApplicationServiceImpl.java

@@ -24,7 +24,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
-import org.springblade.los.Util.IDeptUtils;
+import org.springblade.los.Util.CurrencyUtils;
 import org.springblade.los.box.entity.ExpenseApplication;
 import org.springblade.los.box.entity.TradingBox;
 import org.springblade.los.box.mapper.ExpenseApplicationMapper;
@@ -73,7 +73,7 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 
 	private final IAuditProecessService auditProecessService;
 
-	private final IDeptUtils deptUtils;
+	private final CurrencyUtils currencyUtils;
 
 	@Override
 	public IPage<ExpenseApplicationVO> selectExpenseApplicationPage(IPage<ExpenseApplicationVO> page, ExpenseApplicationVO expenseApplication) {
@@ -192,17 +192,24 @@ public class ExpenseApplicationServiceImpl extends ServiceImpl<ExpenseApplicatio
 			throw new RuntimeException("类型错误，未查到单据");
 		}
 		baseMapper.insert(expenseApplication);
-		for (FeeCenter item : expenseApplication.getFeeCenterList()) {
-			item.setUpdateTime(new Date());
-			item.setUpdateUser(AuthUtil.getUserId());
-			item.setUpdateUserName(AuthUtil.getUserName());
-			item.setStlPid(expenseApplication.getId());
-			item.setAuditStatus("1");
-			item.setApplyId(AuthUtil.getUserId());
-			item.setApplyName(AuthUtil.getUserName());
-			item.setApplyTime(new Date());
+		String exrateType = currencyUtils.standardCurrency(AuthUtil.getDeptId());
+		if (!expenseApplication.getFeeCenterList().isEmpty()) {
+			if (expenseApplication.getFeeCenterList().stream().filter(e -> !e.getCurCode().equals(exrateType))
+				.map(FeeCenter::getCurCode).distinct().count() > 1) {
+				throw new RuntimeException("存在多种外币金额，请重新选择");
+			}
+			for (FeeCenter item : expenseApplication.getFeeCenterList()) {
+				item.setUpdateTime(new Date());
+				item.setUpdateUser(AuthUtil.getUserId());
+				item.setUpdateUserName(AuthUtil.getUserName());
+				item.setStlPid(expenseApplication.getId());
+				item.setAuditStatus("1");
+				item.setApplyId(AuthUtil.getUserId());
+				item.setApplyName(AuthUtil.getUserName());
+				item.setApplyTime(new Date());
+			}
+			feeCenterService.updateBatchById(expenseApplication.getFeeCenterList());
 		}
-		feeCenterService.updateBatchById(expenseApplication.getFeeCenterList());
 		Integer actId = 1130;
 		String processType = "请核费用";
 		String checkType = "FYSQ";

blade-service/blade-los/src/main/java/org/springblade/los/box/service/impl/TradingBoxServiceImpl.java

@@ -2129,7 +2129,7 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 			feeCenter.setUnitNo(item.getBoxType());
 			if (ObjectUtils.isNotNull(item.getPodEmptyContainerReturnDate())
 				&& tradingBox.getRentDate().compareTo(item.getPodEmptyContainerReturnDate()) > 0) {
-				throw new RuntimeException("箱号：" + item.getCode() + "租金计算截止时间大于pod还想日期");
+				throw new RuntimeException("箱号：" + item.getCode() + "租金计算截止时间大于pod还箱日期");
 			}
 			Instant instant1 = item.getRentEndDate().toInstant();
 			Instant instant2 = tradingBox.getRentDate().toInstant();

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1292,7 +1292,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			bills.setAmountProfitLoc(amountProfitLoc);
 			bills.setMasterBillNo("");
 			bills.setMasterId(0L);
-			bills.setSplitOrderSum(bills.getSplitOrderSum() + billsList.size());
+			bills.setSplitOrderSum(bills.getSplitOrderSum() - billsList.size());
 			baseMapper.updateById(bills);
 		}
 		return R.data("操作成功");
@@ -1464,6 +1464,44 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		}
 		declare.setStatus(1);
 		baseMapper.updateById(declare);
+		List<Long> idList = new ArrayList<>();
+		idList.add(declare.getId());
+		if ("MM".equals(declare.getBillType())) {
+			List<Bills> billsList = baseMapper.selectList(new LambdaQueryWrapper<Bills>()
+				.eq(Bills::getTenantId, AuthUtil.getTenantId())
+				.eq(Bills::getIsDeleted, 0)
+				.eq(Bills::getMasterId, declare.getId())
+				.eq(Bills::getBillType, "MH"));
+			if (!billsList.isEmpty()) {
+				for (Bills item : billsList) {
+					item.setStatus(1);
+					item.setUpdateTime(new Date());
+					item.setUpdateUserName(AuthUtil.getUserName());
+					item.setUpdateUser(AuthUtil.getUserId());
+				}
+				this.updateBatchById(billsList);
+				idList.addAll(billsList.stream().map(Bills::getId).collect(Collectors.toList()));
+			}
+		}
+		List<FeeCenter> feeCenterList = feeCenterService.list(new LambdaQueryWrapper<FeeCenter>()
+			.eq(FeeCenter::getTenantId, AuthUtil.getTenantId())
+			.eq(FeeCenter::getIsDeleted, 0)
+			.in(FeeCenter::getPid, idList)
+			.eq(FeeCenter::getAccStatus, "0")
+			.eq(FeeCenter::getAuditStatus, "0"));
+		if (!feeCenterList.isEmpty()) {
+			for (FeeCenter item : feeCenterList) {
+				item.setUpdateTime(new Date());
+				item.setUpdateUser(AuthUtil.getUserId());
+				item.setUpdateUserName(AuthUtil.getUserName());
+				item.setAuditStatus("1");
+				item.setApplyId(AuthUtil.getUserId());
+				item.setApplyName(AuthUtil.getUserName());
+				item.setApplyTime(new Date());
+			}
+			feeCenterService.updateBatchById(feeCenterList);
+		}
+
 		return declare;
 	}
 
@@ -1820,6 +1858,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		copyBills.setInvoiceCrStatusDescr("未开");
 		copyBills.setBillStatus(0);
 		copyBills.setAccountStatus(0);
+		copyBills.setSplitOrderSum(0);
 		copyBills.setFeeCenterListC(feeCenterListC);
 		copyBills.setFeeCenterListD(feeCenterListD);
 		copyBills.setPreContainersList(preContainersList);
@@ -2392,7 +2431,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			throw new RuntimeException("缺少必要参数");
 		}
 		Bills detail = baseMapper.selectById(bills.getId());
-		if (ObjectUtils.isNull(detail.getActualEtd())){
+		if (ObjectUtils.isNull(detail.getActualEtd())) {
 			throw new RuntimeException("请先维护实际开船日期");
 		}
 		detail.setTransferOrderStatus("已转单");

blade-service/blade-los/src/main/java/org/springblade/los/check/controller/AuditProecessController.java

@@ -68,8 +68,6 @@ public class AuditProecessController extends BladeController {
 
 	private final IBCorpsService bCorpsService;
 
-	private final IDeptUtils deptUtils;
-
 	/**
 	 * 分页 审批流记录
 	 */

blade-service/blade-los/src/main/java/org/springblade/los/check/service/impl/AuditProecessServiceImpl.java

@@ -539,15 +539,17 @@ public class AuditProecessServiceImpl extends ServiceImpl<AuditProecessMapper, L
 			} else {
 				item.setAuditStatus("4");
 			}
+			int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
+			item.setVersion(String.valueOf(version + 1));
 		}
 		if (3 != status) {
 			feeCenterService.updateBatchById(feeCenterList);
 		}
 		for (Bills item : billsList) {
-			bills.setApprovedDate(new Date());
-			int version = StringUtil.isBlank(bills.getVersion()) ? 1 : Integer.parseInt(bills.getVersion());
-			bills.setVersion(String.valueOf(version + 1));
-			bills.setStatus(status);
+			item.setApprovedDate(new Date());
+			int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
+			item.setVersion(String.valueOf(version + 1));
+			item.setStatus(status);
 			if (3 == status) {
 				item.setBillStatus(status);
 			}

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FeeCenterServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.los.Util.CurrencyUtils;
 import org.springblade.los.basic.corps.entity.BCorps;
 import org.springblade.los.basic.corps.service.IBCorpsService;
@@ -563,6 +564,12 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			Date date = list.get(0).getBillDate();
 			String exrateType = currencyUtils.standardCurrency(branchId);
 			List<BCurExrate> curExrateList = currencyUtils.obtainRate(date, "1", branchId);
+			List<Long> idList = list.stream().map(FeeCenter::getId).filter(Objects::nonNull).collect(Collectors.toList());
+			List<FeeCenter> feeCenters = new ArrayList<>();
+			if (!idList.isEmpty()) {
+				feeCenters = baseMapper.selectList(new LambdaQueryWrapper<FeeCenter>()
+					.in(FeeCenter::getId, idList));
+			}
 			for (FeeCenter feeCenter : list) {
 				if (feeCenter.getId() == null) {
 					feeCenter.setCreateTime(new Date());
@@ -573,7 +580,19 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 						feeCenter.setBranchId(branchId);
 						feeCenter.setCreateDeptName(deptName);
 					}
+					int version = StringUtil.isBlank(feeCenter.getVersion()) ? 1 : Integer.parseInt(feeCenter.getVersion());
+					feeCenter.setVersion(String.valueOf(version + 1));
 				} else {
+					if (!feeCenters.isEmpty()) {
+						FeeCenter feeCenter1 = feeCenters.stream().filter(e -> e.getId().equals(feeCenter.getId())).findFirst().orElse(null);
+						if (feeCenter1 != null) {
+							if (!Objects.equals(feeCenter1.getVersion(), feeCenter.getVersion())) {
+								throw new RuntimeException("数据已被其他用户更新，请等待刷新后重试");
+							}
+						}
+					}
+					int version = StringUtil.isBlank(feeCenter.getVersion()) ? 1 : Integer.parseInt(feeCenter.getVersion());
+					feeCenter.setVersion(String.valueOf(version + 1));
 					feeCenter.setUpdateUser(AuthUtil.getUserId());
 					feeCenter.setUpdateTime(new Date());
 					feeCenter.setUpdateUserName(AuthUtil.getUserName());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.los.Util.CurrencyUtils;
 import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.basic.business.entity.BusinessType;
@@ -125,21 +126,11 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public R generateBill(FinAccBills finAccBills) {
-		if (ObjectUtils.isNull(finAccBills.getFeeCenterList()) || finAccBills.getFeeCenterList().size() == 0) {
+		if (ObjectUtils.isNull(finAccBills.getFeeCenterList()) || finAccBills.getFeeCenterList().isEmpty()) {
 			throw new RuntimeException("请选择费用信息");
 		}
 		List<FeeCenter> feeCenterList = new ArrayList<>();
 		List<FinAccBills> finAccBillsList = new ArrayList<>();
-		String deptId = AuthUtil.getDeptId();
-		String deptName = "";
-		String branchId = AuthUtil.getDeptId();
-		//获取部门ids对应中文名
-		if (ObjectUtils.isNotNull(deptId)) {
-			R<List<String>> res = sysClient.getDeptNames(deptId);
-			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
-				deptName = String.join(",", res.getData());
-			}
-		}
 		List<Bills> billsList = new ArrayList<>();
 		List<Long> ids = finAccBills.getFeeCenterList().stream().map(FeeCenter::getPid).collect(Collectors.toList());
 		for (FeeCenter item : finAccBills.getFeeCenterList()) {
@@ -166,14 +157,27 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			throw new RuntimeException("未找到可用业务类型");
 		}
 		List<FeeCenter> reducelList = finAccBills.getFeeCenterList().stream().filter(distinctByKey(FeeCenter::getBillKey)).collect(Collectors.toList());
+		String deptId = AuthUtil.getDeptId();
+		String deptName = "";
+		String branchId = AuthUtil.getDeptId();
 		if (ObjectUtils.isNotNull(ids) && !ids.isEmpty()) {
 			billsList = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
 				.eq(Bills::getTenantId, AuthUtil.getTenantId())
 				.eq(Bills::getIsDeleted, 0)
 				.in(Bills::getId, ids));
-			for (Bills item : billsList) {
-				item.setBillingStatus(item.getBillingStatus() + reducelList.size());
-				billsMapper.updateById(item);
+			if (!billsList.isEmpty()) {
+				for (Bills item : billsList) {
+					item.setBillingStatus(item.getBillingStatus() + reducelList.size());
+					billsMapper.updateById(item);
+				}
+				deptId = billsList.get(0).getBranchId();
+			}
+		}
+		//获取部门ids对应中文名
+		if (ObjectUtils.isNotNull(deptId)) {
+			R<List<String>> res = sysClient.getDeptNames(deptId);
+			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+				deptName = String.join(",", res.getData());
 			}
 		}
 		String exrateType = currencyUtils.standardCurrency(branchId);
@@ -193,10 +197,8 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			data.setCreateDept(deptId);
 			data.setCreateDeptName(deptName);
 			data.setBranchId(branchId);
-			data.setDeptId(deptUtils.getDeptPid());
+			data.setDeptId(Long.parseLong(branchId));
 			data.setDeptName(deptName);
-			data.setTeamId(finAccBills.getTeamId());
-			data.setTeamName(finAccBills.getTeamName());
 			BusinessBillNo businessBillNo = new BusinessBillNo();
 			businessBillNo.setBusinessTypeId(businessType.getId());
 			businessBillNo.setCode(finAccBills.getBillNoFormat());
@@ -312,6 +314,8 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 				feeCenterItem.setAccById(AuthUtil.getUserId());
 				feeCenterItem.setAccByName(AuthUtil.getUserName());
 				feeCenterItem.setAuditStatus("4");
+				int version = StringUtil.isBlank(item.getVersion()) ? 1 : Integer.parseInt(item.getVersion());
+				item.setVersion(String.valueOf(version + 1));
 				feeCenterList.add(feeCenterItem);
 			}
 		}

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/service/impl/StatisticAnalysisServiceImpl.java

@@ -517,12 +517,12 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 			tradingBoxLambdaQueryWrapper.eq(TradingBox::getTenantId, AuthUtil.getTenantId())
 				.eq(TradingBox::getIsDeleted, 0)
 				.eq(TradingBox::getType, type)
-				.apply(ObjectUtils.isNotNull(dateStart), "DATE_FORMAT(effective_date,'%Y-%m-%d') >= '" + dateStart + "'")
-				.apply(ObjectUtils.isNotNull(dateEnd), "DATE_FORMAT(expiry_date,'%Y-%m-%d') <= '" + dateEnd + "'");
+				.apply(ObjectUtils.isNotNull(dateStart), "DATE_FORMAT(effective_date,'%Y-%m-%d') <= '" + dateStart + "'")
+				.apply(ObjectUtils.isNotNull(dateEnd), "DATE_FORMAT(expiry_date,'%Y-%m-%d') >= '" + dateEnd + "'");
 			List<TradingBox> tradingBoxList = tradingBoxService.list(tradingBoxLambdaQueryWrapper);
 			sum = tradingBoxList.size();
-			refurbishment = tradingBoxList.stream().filter(e -> "是".equals(e.getWhetherEnable())).count();
-			complete = tradingBoxList.stream().filter(e -> !"是".equals(e.getWhetherEnable())).count();
+			refurbishment = tradingBoxList.stream().filter(e -> !"是".equals(e.getWhetherEnable())).count();
+			complete = tradingBoxList.stream().filter(e -> "是".equals(e.getWhetherEnable())).count();
 			map.put("sum", sum);
 			map.put("refurbishment", refurbishment);
 			map.put("complete", complete);

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -113,21 +113,12 @@ public class UserController {
 
 	@GetMapping("/userList")
 	public R userList(UserVO userVO) {
-		if (AuthUtil.getTenantId().equals("234557") && StringUtil.isBlank(userVO.getRoleAlias())) {
-			userVO.setRoleAlias("业务员");
-		}
-		if (AuthUtil.getTenantId().equals("119111") && StringUtil.isBlank(userVO.getRoleAlias())) {
-			userVO.setRoleAlias("业务员");
-		}
+
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
 			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
-
-		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			userVO.setRoleAlias("分管调度");
-		}
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
 			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());
 			if (!roleR.isSuccess()) {
@@ -144,7 +135,11 @@ public class UserController {
 				return R.data(new ArrayList<>());
 			}
 		}
-
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(userVO.getDeptId()), User::getDeptId, userVO.getDeptId());
+		}
 		List<UserVO> userList = UserWrapper.build().listVO(userService.list(lambdaQueryWrapper));
 		if (StringUtil.isNotBlank(userVO.getSource())) {
 			String deptIds = userList.stream().map(UserVO::getDeptId).distinct().collect(Collectors.joining(","));
@@ -174,15 +169,6 @@ public class UserController {
 			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
-
-		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			if ("1504336886057963521".equals(userVO.getDeptPid()) || "1567796746975727617".equals(userVO.getDeptPid())
-				|| "1862313560907030530".equals(userVO.getDeptPid())|| "1863853735860514817".equals(userVO.getDeptPid())) {
-				userVO.setRoleAlias("分管调度");
-			} else {
-				userVO.setRoleAlias("大件调度");
-			}
-		}
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
 			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());
 			if (!roleR.isSuccess()) {
@@ -190,14 +176,17 @@ public class UserController {
 			}
 			lambdaQueryWrapper.like(User::getRoleId, roleR.getData());
 		}
-
 		if (StringUtil.isNotBlank(userVO.getUserExt())) {
 			List<Long> userIdList = userService.getUserIdByCorpId(Long.parseLong(userVO.getUserExt()));
 			if (CollectionUtil.isNotEmpty(userIdList)) {
 				lambdaQueryWrapper.in(User::getId, userIdList);
 			}
 		}
-
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(userVO.getDeptId()), User::getDeptId, userVO.getDeptId());
+		}
 		List<UserVO> userList = UserWrapper.build().listVO(userService.list(lambdaQueryWrapper));
 		if (StringUtil.isNotBlank(userVO.getSource())) {
 			userList.forEach(user -> {
@@ -218,7 +207,6 @@ public class UserController {
 				.eq(User::getIsDeleted, 0);
 			return R.data(userService.list(wrapper));
 		}
-
 		List<User> list = new ArrayList<>();
 		if (StringUtil.isNotBlank(userVO.getRoleId())) {
 			String[] roleArray = userVO.getRoleId().split(",");
@@ -526,11 +514,14 @@ public class UserController {
 	public R userListAll(UserVO userVO) {
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
-			.like(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
-			.like(ObjectUtil.isNotEmpty(userVO.getDeptId()), User::getDeptId, userVO.getDeptId())
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.like(ObjectUtil.isNotEmpty(userVO.getRealName()), User::getRealName, userVO.getRealName())
 			.eq(User::getIsDeleted, 0);
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			lambdaQueryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtils.isNotNull(userVO.getDeptId()), User::getDeptId, userVO.getDeptId());
+		}
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
 			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());
 			if (!roleR.isSuccess()) {

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -157,13 +157,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 
 	@Override
 	public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
-		/*if (!AuthUtil.getUserRole().contains("admin")) {
-			if (ObjectUtils.isNull(deptId)) {
-				deptId = Long.parseLong(AuthUtil.getDeptId().split(",")[0]);
-			}
-		} else {
-			deptId = null;
-		}*/
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			deptId = Long.parseLong(AuthUtil.getDeptId());
+		}
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		R<String> res = sysClient.getRoleIds(AuthUtil.getTenantId(), user.getRoleId());
 		String roleId = "";
@@ -547,9 +543,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 	public R<List<User>> selectUserByRolesAndAccount(String roleIds, String account) {
 		List<Long> roleIdList = Func.toLongList(roleIds);
 		LambdaQueryWrapper<User> queryWrapper = Wrappers.lambdaQuery();
-		String status = sysClient.getParamServiceNew("mall.data");
-		if (ObjectUtils.isNotNull(status) && "1".equals(status)) {
-			queryWrapper.apply("find_in_set(dept_id,'" + AuthUtil.getDeptId() + "')");
+		if (!AuthUtil.getUserRole().contains("总部") && !AuthUtil.getUserRole().contains("admin")) {
+			queryWrapper.eq(User::getDeptId, AuthUtil.getDeptId());
 		}
 		if (StringUtil.isNotBlank(account)) {
 			queryWrapper.like(User::getAccount, account);