2024年1月26日11:14:03

blade-auth/src/main/java/org/springblade/auth/granter/SocialTokenGranter.java

@@ -113,7 +113,7 @@ public class SocialTokenGranter extends AbstractTokenGranter {
 			bladeUserDetails = new BladeUserDetails(user.getId(),
 				tenantId, result.getData().getOauthId(), user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(result.getData().getRoles()), Func.toStr(userOauth.getAvatar(), TokenUtil.DEFAULT_AVATAR),
 				userOauth.getUsername(), AuthConstant.ENCRYPT + user.getPassword(), detail, true, true, true, true,
-				AuthorityUtils.commaSeparatedStringToAuthorityList(Func.join(result.getData().getRoles())),null,"","");
+				AuthorityUtils.commaSeparatedStringToAuthorityList(Func.join(result.getData().getRoles())),null,"","",user.getDeptPid());
 		} else {
 			throw new InvalidGrantException("social grant failure, feign client return error");
 		}

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetails.java

@@ -89,10 +89,12 @@ public class BladeUserDetails extends User {
 
 	//客户地址
 	private final String corpAddress;
+
+	private final String deptPid;
 	public BladeUserDetails(Long userId, String tenantId, String oauthId, String name, String realName, String deptId, String postId, String roleId,
 							String roleName, String avatar, String username, String password, Kv detail, boolean enabled,
 							boolean accountNonExpired, boolean credentialsNonExpired, boolean accountNonLocked,
-							Collection<? extends GrantedAuthority> authorities,Long corpId,String corpName,String corpAddress) {
+							Collection<? extends GrantedAuthority> authorities,Long corpId,String corpName,String corpAddress,String deptPid) {
 		super(username, password, enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, authorities);
 		this.userId = userId;
 		this.tenantId = tenantId;
@@ -109,6 +111,7 @@ public class BladeUserDetails extends User {
 		this.corpId = corpId;
 		this.corpName = corpName;
 		this.corpAddress = corpAddress;
+		this.deptPid = deptPid;
 	}
 
 }

blade-auth/src/main/java/org/springblade/auth/service/BladeUserDetailsServiceImpl.java

@@ -250,7 +250,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				return new BladeUserDetails(user1.getId(),
 					user1.getTenantId(), StringPool.EMPTY, user1.getName(), user1.getRealName(), user1.getDeptId(), user1.getPostId(), user1.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user1.getAvatar(), TokenUtil.DEFAULT_AVATAR),
 					user1.getAccount(), AuthConstant.ENCRYPT + user1.getPassword(), userInfo.getDetail(), true, true, true, true,
-					AuthorityUtils.commaSeparatedStringToAuthorityList(Func.join(result.getData().getRoles())), corpId, corpName, corpAddress);
+					AuthorityUtils.commaSeparatedStringToAuthorityList(Func.join(result.getData().getRoles())), corpId, corpName, corpAddress,user1.getDeptPid());
 			} else {
 				throw new UsernameNotFoundException(result.getMsg());
 			}
@@ -342,7 +342,7 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 				return new BladeUserDetails(user.getId(),
 					user.getTenantId(), StringPool.EMPTY, user.getName(), user.getRealName(), user.getDeptId(), user.getPostId(), user.getRoleId(), Func.join(userInfo.getRoles()), Func.toStr(user.getAvatar(), TokenUtil.DEFAULT_AVATAR),
 					username, AuthConstant.ENCRYPT + user.getPassword(), userInfo.getDetail(), true, true, true, true,
-					AuthorityUtils.commaSeparatedStringToAuthorityList(Func.join(result.getData().getRoles())), corpId, corpName, corpAddress);
+					AuthorityUtils.commaSeparatedStringToAuthorityList(Func.join(result.getData().getRoles())), corpId, corpName, corpAddress,user.getDeptPid());
 			} else {
 				throw new UsernameNotFoundException(result.getMsg());
 			}

blade-auth/src/main/java/org/springblade/auth/support/BladeJwtTokenEnhancer.java

@@ -66,6 +66,7 @@ public class BladeJwtTokenEnhancer implements TokenEnhancer {
 		info.put("corp_id", principal.getCorpId());
 		info.put("corp_name", principal.getCorpName());
 		info.put("corp_address", principal.getCorpAddress());
+		info.put("dept_pid", principal.getDeptPid());
 		((DefaultOAuth2AccessToken) accessToken).setAdditionalInformation(info);
 
 		//token状态设置

blade-service-api/blade-los-api/src/main/java/org/springblade/los/statisticAnalysis/FinanceProfit.java

@@ -0,0 +1,53 @@
+package org.springblade.los.statisticAnalysis;
+
+import lombok.Data;
+
+/**
+ * @author :jixinyuan
+ * @date : 2024/1/26
+ */
+@Data
+public class FinanceProfit {
+
+
+	/**
+	 * 业务类型
+	 */
+	private String billType;
+
+	/**
+	 * 业务编号
+	 */
+	private String billNo;
+
+	/**
+	 * hblno
+	 */
+	private String hBlNo;
+
+	/**
+	 * mblno
+	 */
+	private String mBlNo;
+
+	/**
+	 * 往来单位Id
+	 */
+	private String corpId;
+
+	/**
+	 * 往来单位
+	 */
+	private String corpName;
+
+	/**
+	 * 统计日期
+	 */
+	private String statisticsDate;
+
+	/**
+	 * 业务员
+	 */
+	private String salesman;
+
+}

blade-service/blade-los/src/main/java/org/springblade/los/Util/DeptUtils.java

@@ -2,9 +2,12 @@ package org.springblade.los.Util;
 
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.feign.ISysClient;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.stereotype.Service;
 
 /**
@@ -17,6 +20,8 @@ public class DeptUtils implements IDeptUtils {
 
 	private final ISysClient sysClient;
 
+	private final IUserClient userClient;
+
 
 	@Override
 	public Dept getDept(String deptId) {
@@ -59,4 +64,20 @@ public class DeptUtils implements IDeptUtils {
 			return null;
 		}
 	}
+
+	@Override
+	public Long getDeptPid() {
+		R<User> r = userClient.userInfoById(AuthUtil.getUserId());
+		if (r.isSuccess()) {
+			String deptId = r.getData().getDeptPid();
+			String[] arr = deptId.split(",");
+			if (arr.length > 0) {
+				return Long.parseLong(arr[0]);
+			} else {
+				throw new RuntimeException("用户部门数据错误");
+			}
+		} else {
+			throw new RuntimeException("用户部门数据错误");
+		}
+	}
 }

blade-service/blade-los/src/main/java/org/springblade/los/Util/IDeptUtils.java

@@ -10,4 +10,6 @@ public interface IDeptUtils {
 
 	public Dept getDept(String deptId);
 
+	Long getDeptPid();
+
 }

blade-service/blade-los/src/main/java/org/springblade/los/Util/MagicValues.java

@@ -28,6 +28,7 @@ public class MagicValues {
 	public static final String HYCK = "HYCK";
 	public static final String HYJK = "HYJK";
 	public static final String AMEND = "AMEND";
+	public static final String AMEND_SI = "AMENDSI";
 	public static final String SE = "SE";
 	public static final String SI = "SI";
 	public static final String AE = "AE";

blade-service/blade-los/src/main/java/org/springblade/los/basic/acc/service/impl/AccountsServiceImpl.java

@@ -78,7 +78,7 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 	public R submit(Accounts accounts) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -86,12 +86,6 @@ public class AccountsServiceImpl extends ServiceImpl<AccountsMapper, Accounts> i
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (accounts.getId() == null) {
 			accounts.setCreateTime(new Date());

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/controller/BCorpsController.java

@@ -37,6 +37,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.los.Util.IDeptUtils;
 import org.springblade.los.basic.corps.entity.BCorps;
 import org.springblade.los.basic.corps.entity.BCorpsTypes;
 import org.springblade.los.basic.corps.service.IBCorpsService;
@@ -45,6 +46,7 @@ import org.springblade.los.basic.corps.vo.BCorpsVO;
 import org.springblade.los.basic.utils.ExtendedData;
 import org.springblade.los.business.sea.entity.Bills;
 import org.springblade.los.excel.BCorpsExcel;
+import org.springblade.system.entity.Dept;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -70,6 +72,8 @@ public class BCorpsController extends BladeController {
 
 	private final IBCorpsTypesService bCorpsTypesService;
 
+	private final IDeptUtils deptUtils;
+
 	/**
 	 * 详情
 	 */
@@ -118,7 +122,7 @@ public class BCorpsController extends BladeController {
 		if (AuthUtil.getUserRole().contains("admin") || AuthUtil.getUserRole().contains("secondaryAdmin")) {
 			//管理员、次级管理员查看全部数据
 		} else {
-			lambdaQueryWrapper.apply("find_in_set('" + AuthUtil.getDeptId() + "',branch_id)");
+			lambdaQueryWrapper.apply("find_in_set('" + deptUtils.getDeptPid() + "',branch_id)");
 		}
 		lambdaQueryWrapper.orderByDesc(BCorps::getCreateTime);
 		IPage<BCorps> pages = bCorpsService.page(Condition.getPage(query), lambdaQueryWrapper);

blade-service/blade-los/src/main/java/org/springblade/los/basic/corps/service/impl/BCorpsServiceImpl.java

@@ -94,7 +94,7 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 	public R submit(BCorps bCorps) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -102,12 +102,6 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		long cname = baseMapper.selectCount(new LambdaQueryWrapper<BCorps>()
 			.eq(BCorps::getCnName, bCorps.getCnName())
@@ -356,7 +350,7 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 	public R<List<BCorps>> importBCorps(List<BCorpsExcel> excelList) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -364,12 +358,6 @@ public class BCorpsServiceImpl extends ServiceImpl<CorpsMapper, BCorps> implemen
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		List<BCorps> bCorpsList = new ArrayList<>();
 		for (BCorpsExcel item : excelList) {

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

@@ -1320,7 +1320,7 @@ public class ReportsServiceImpl extends ServiceImpl<ReportsMapper, Reports> impl
 			} else {
 				map.put(MagicValues.DATA, null);
 			}
-		} else if (MagicValues.AMEND.equals(reportCode) && MagicValues.AMEND.equals(type)
+		} else if (MagicValues.AMEND_SI.equals(reportCode) && MagicValues.AMEND.equals(type)
 			&& (MagicValues.SE.equals(groupCode) || MagicValues.SI.equals(groupCode) || MagicValues.AE.equals(groupCode) || MagicValues.AI.equals(groupCode))) {
 			List<Bills> list = new ArrayList<>();
 			Amends amends = amendsService.getById(billId);

blade-service/blade-los/src/main/java/org/springblade/los/billno/service/impl/BusinessBillNoServiceImpl.java

@@ -70,16 +70,7 @@ public class BusinessBillNoServiceImpl extends ServiceImpl<BusinessBillNoMapper,
 
 	@Override
 	public R<String> getBillNoLos(BusinessBillNo businessBillNo) {
-		String branchId = "";
-		//获取部门ids对应中文名
-		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = AuthUtil.getDeptId();
-			}
-		}
+		String branchId = deptUtils.getDeptPid()+"";
 		BusinessBillNo detail = baseMapper.selectOne(new LambdaQueryWrapper<BusinessBillNo>()
 			.eq(BusinessBillNo::getTenantId, AuthUtil.getTenantId())
 			.eq(BusinessBillNo::getIsDeleted, 0)

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/service/impl/AeaBillsServiceImpl.java

@@ -101,7 +101,7 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 	public R submit(AeaBills aeaBills) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -109,12 +109,6 @@ public class AeaBillsServiceImpl extends ServiceImpl<AeaBillsMapper, AeaBills> i
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (ObjectUtils.isNotNull(aeaBills.getMblno())) {
 			aeaBills.setMblno(aeaBills.getMblno().replaceAll(" ", ""));

blade-service/blade-los/src/main/java/org/springblade/los/business/amends/service/impl/AmendsServiceImpl.java

@@ -94,7 +94,7 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 	public R submit(Amends amends) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -102,12 +102,6 @@ public class AmendsServiceImpl extends ServiceImpl<AmendsMapper, Amends> impleme
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		amends.setBillDate(new Date());
 		if (amends.getId() == null) {

blade-service/blade-los/src/main/java/org/springblade/los/business/files/service/impl/FilesCenterServiceImpl.java

@@ -56,7 +56,7 @@ public class FilesCenterServiceImpl extends ServiceImpl<FilesCenterMapper, Files
 	public R submit(FilesCenter filesCenter) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -64,12 +64,6 @@ public class FilesCenterServiceImpl extends ServiceImpl<FilesCenterMapper, Files
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (filesCenter.getId() == null) {
 			filesCenter.setCreateTime(new Date());

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

@@ -116,7 +116,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 	public R submit(Bills bills) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -124,12 +124,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (ObjectUtils.isNotNull(bills.getMblno())) {
 			bills.setMblno(bills.getMblno().replaceAll(" ", ""));
@@ -660,7 +654,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 	public R add(Bills bills) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -668,12 +662,6 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		long billNo = baseMapper.selectCount(new LambdaQueryWrapper<Bills>()
 			.eq(Bills::getBillNo, bills.getBillNo())

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

@@ -57,7 +57,7 @@ public class ContainersCommodityServiceImpl extends ServiceImpl<ContainersCommod
 	public R submit(ContainersCommodity containersCommodity) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -65,12 +65,6 @@ public class ContainersCommodityServiceImpl extends ServiceImpl<ContainersCommod
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (containersCommodity.getId() == null) {
 			containersCommodity.setCreateTime(new Date());
@@ -94,7 +88,7 @@ public class ContainersCommodityServiceImpl extends ServiceImpl<ContainersCommod
 	public R submitList(List<ContainersCommodity> containersCommodityList) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -102,12 +96,6 @@ public class ContainersCommodityServiceImpl extends ServiceImpl<ContainersCommod
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		for (ContainersCommodity containersCommodity : containersCommodityList) {
 			if (containersCommodity.getId() == null) {

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

@@ -81,7 +81,7 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 	public R submit(Containers containers) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -89,12 +89,7 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
+
 		}
 		List<Containers> sealNoCount = baseMapper.selectList(new LambdaQueryWrapper<Containers>()
 			.eq(Containers::getTenantId, AuthUtil.getTenantId())
@@ -410,7 +405,7 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 	public R submitList(List<Containers> list) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -418,12 +413,6 @@ public class ContainersServiceImpl extends ServiceImpl<ContainersMapper, Contain
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		List<ContainersBills> containersBillsList = new ArrayList<>();
 		List<ContainersBills> subtractContainersBillsList = new ArrayList<>();

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

@@ -76,7 +76,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 	public R submit(PreContainers preContainers) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -84,12 +84,6 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (preContainers.getId() == null) {
 			preContainers.setCreateTime(new Date());
@@ -197,7 +191,7 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 	public R submitList(List<PreContainers> preContainersList) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -205,12 +199,6 @@ public class PreContainersServiceImpl extends ServiceImpl<PreContainersMapper, P
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		List<Containers> containersList = new ArrayList<>();
 		for (PreContainers preContainers : preContainersList) {

blade-service/blade-los/src/main/java/org/springblade/los/finance/agreement/service/impl/AgreementPriceServiceImpl.java

@@ -70,7 +70,7 @@ public class AgreementPriceServiceImpl extends ServiceImpl<AgreementPriceMapper,
 	public R submit(AgreementPrice agreementPrice) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -78,12 +78,6 @@ public class AgreementPriceServiceImpl extends ServiceImpl<AgreementPriceMapper,
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (agreementPrice.getId() == null) {
 			agreementPrice.setCreateTime(new Date());

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

@@ -86,7 +86,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 	public R submit(FeeCenter feeCenter) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -94,12 +94,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (feeCenter.getId() == null) {
 			feeCenter.setCreateTime(new Date());
@@ -359,7 +353,7 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 	public R submitList(List<FeeCenter> list) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -367,12 +361,6 @@ public class FeeCenterServiceImpl extends ServiceImpl<FeeCenterMapper, FeeCenter
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		List<FeeCenter> feeCenterList = new ArrayList<>();
 		for (FeeCenter feeCenter : list) {

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

@@ -134,7 +134,7 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 		List<FinAccBills> finAccBillsList = new ArrayList<>();
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -142,12 +142,6 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		List<Bills> billsList = new ArrayList<>();
 		List<Long> ids = finAccBills.getFeeCenterList().stream().map(FeeCenter::getPid).collect(Collectors.toList());

blade-service/blade-los/src/main/java/org/springblade/los/finance/invoices/service/impl/FinInvoicesServiceImpl.java

@@ -98,7 +98,7 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 	public R submit(FinInvoices finInvoices) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -106,12 +106,6 @@ public class FinInvoicesServiceImpl extends ServiceImpl<FinInvoicesMapper, FinIn
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (finInvoices.getId() == null) {
 			BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -139,7 +139,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 	public R submit(FinStlBills finStlBills) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -147,12 +147,6 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (finStlBills.getId() == null) {
 			BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()

blade-service/blade-los/src/main/java/org/springblade/los/finance/vouchers/service/impl/FinVouchersServiceImpl.java

@@ -108,7 +108,7 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 	public R submit(FinVouchers finVouchers) {
 		String deptId = "";
 		String deptName = "";
-		String branchId = "";
+		String branchId = deptUtils.getDeptPid()+"";
 		//获取部门ids对应中文名
 		if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
 			deptId = AuthUtil.getDeptId();
@@ -116,12 +116,6 @@ public class FinVouchersServiceImpl extends ServiceImpl<FinVouchersMapper, FinVo
 			if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
 				deptName = String.join(",", res.getData());
 			}
-			Dept dept = deptUtils.getDept(AuthUtil.getDeptId());
-			if (dept != null) {
-				branchId = dept.getId() + "";
-			} else {
-				branchId = deptId;
-			}
 		}
 		if (finVouchers.getId() == null) {
 			BusinessType businessType = bBusinessTypeService.getOne(new LambdaQueryWrapper<BusinessType>()

blade-service/blade-los/src/main/java/org/springblade/los/statisticAnalysis/controller/FinanceStatisticsController.java

@@ -14,6 +14,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.los.statisticAnalysis.DecisionAnalysis;
+import org.springblade.los.statisticAnalysis.FinanceProfit;
 import org.springblade.los.statisticAnalysis.service.IStatisticAnalysisService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,11 +37,11 @@ public class FinanceStatisticsController {
 	/**
 	 * 分页 决策分析列表
 	 */
-	@GetMapping("/decisionAnalysis")
+	@GetMapping("/financeProfit")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入decisionAnalysis")
-	public R<IPage<DecisionAnalysis>> list(DecisionAnalysis decisionAnalysis, Query query) {
-		return statisticAnalysisService.decisionAnalysis(decisionAnalysis, Condition.getPage(query));
+	public R<IPage<FinanceProfit>> financeProfit(FinanceProfit financeProfit, Query query) {
+		return statisticAnalysisService.financeProfit(financeProfit, Condition.getPage(query));
 	}
 
 }

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

@@ -19,6 +19,7 @@ package org.springblade.los.statisticAnalysis.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.tool.api.R;
 import org.springblade.los.statisticAnalysis.DecisionAnalysis;
+import org.springblade.los.statisticAnalysis.FinanceProfit;
 
 import java.util.List;
 import java.util.Map;
@@ -43,4 +44,6 @@ public interface IStatisticAnalysisService {
 	R<List<Map<String, Object>>> decisionAnalysisByCGS();
 
 	R<List<Map<String, Object>>> decisionAnalysisByYWY();
+
+    R<IPage<FinanceProfit>> financeProfit(FinanceProfit financeProfit, IPage<Object> page);
 }

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

@@ -5,6 +5,7 @@ import lombok.AllArgsConstructor;
 import org.springblade.core.tool.api.R;
 import org.springblade.los.statisticAnalysis.DecisionAnalysis;
 import org.springblade.los.business.sea.mapper.BillsMapper;
+import org.springblade.los.statisticAnalysis.FinanceProfit;
 import org.springblade.los.statisticAnalysis.service.IStatisticAnalysisService;
 import org.springframework.stereotype.Service;
 
@@ -37,4 +38,9 @@ public class StatisticAnalysisServiceImpl implements IStatisticAnalysisService {
 		List<Map<String, Object>> list = billsMapper.decisionAnalysisByYWY();
 		return R.data(list);
 	}
+
+	@Override
+	public R<IPage<FinanceProfit>> financeProfit(FinanceProfit financeProfit, IPage<Object> page) {
+		return null;
+	}
 }

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

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.AllArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
@@ -31,6 +32,8 @@ import org.springblade.system.cache.SysCache;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.mapper.DeptMapper;
 import org.springblade.system.service.IDeptService;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springblade.system.vo.DeptVO;
 import org.springblade.system.wrapper.DeptWrapper;
 import org.springframework.stereotype.Service;
@@ -47,11 +50,14 @@ import java.util.stream.Collectors;
  * @author Chill
  */
 @Service
+@AllArgsConstructor
 public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements IDeptService {
 
 	private static final String TENANT_ID = "tenantId";
 	private static final String PARENT_ID = "parentId";
 
+	private final IUserClient userClient;
+
 	@Override
 	public List<DeptVO> lazyList(String tenantId, Long parentId, Map<String, Object> param) {
 		// 设置租户ID
@@ -86,8 +92,15 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 	public List<DeptVO> tree(String tenantId) {
 		List<DeptVO> tree = null;
 		if (!AuthUtil.getUserRole().contains("admin")) {
-			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
-				tree = baseMapper.tree(tenantId, Long.parseLong(AuthUtil.getDeptId()));
+			R<User> r = userClient.userInfoById(AuthUtil.getUserId());
+			if (r.isSuccess()) {
+				tree = baseMapper.tree(tenantId, Long.parseLong(r.getData().getDeptPid().split(",")[0]));
+			} else {
+				if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+					tree = baseMapper.tree(tenantId, Long.parseLong(AuthUtil.getDeptId().split(",")[0]));
+				} else {
+					tree = new ArrayList<>();
+				}
 			}
 		} else {
 			tree = baseMapper.tree(tenantId, null);
@@ -102,8 +115,15 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements ID
 		}
 		List<DeptVO> tree = null;
 		if (!AuthUtil.getUserRole().contains("admin")) {
-			if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
-				tree = baseMapper.lazyTree(tenantId, parentId, Long.parseLong(AuthUtil.getDeptId()));
+			R<User> r = userClient.userInfoById(AuthUtil.getUserId());
+			if (r.isSuccess()) {
+				tree = baseMapper.lazyTree(tenantId, parentId, Long.parseLong(r.getData().getDeptPid().split(",")[0]));
+			} else {
+				if (ObjectUtils.isNotNull(AuthUtil.getDeptId())) {
+					tree = baseMapper.lazyTree(tenantId, parentId, Long.parseLong(AuthUtil.getDeptId().split(",")[0]));
+				} else {
+					tree = new ArrayList<>();
+				}
 			}
 		} else {
 			tree = baseMapper.lazyTree(tenantId, parentId, null);

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

@@ -159,9 +159,11 @@ 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.isNotNull(AuthUtil.getDeptId())) {
-				deptId = Long.parseLong(AuthUtil.getDeptId());
+			if (ObjectUtils.isNull(deptId)) {
+				deptId = Long.parseLong(AuthUtil.getDeptId().split(",")[0]);
 			}
+		} else {
+			deptId = null;
 		}
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));