2023年7月21日17:35:47

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

@@ -276,6 +276,9 @@ public class BladeUserDetailsServiceImpl implements UserDetailsService {
 			// 判断返回信息
 			if (result.isSuccess()) {
 				UserInfo userInfo = result.getData();
+				if (userInfo == null){
+					throw new RuntimeException(TokenUtil.USER_DEACTIVATE);
+				}
 				User user = userInfo.getUser();
 				// 用户不存在,但提示用户名与密码错误并锁定账号
 				if (user == null || user.getId() == null) {

blade-auth/src/main/java/org/springblade/auth/utils/TokenUtil.java

@@ -68,6 +68,7 @@ public class TokenUtil {
 	public final static String USER_TYPE_HEADER_KEY = "User-Type";
 	public final static String DEFAULT_USER_TYPE = "web";
 	public final static String USER_NOT_FOUND = "用户名或密码错误";
+	public final static String USER_DEACTIVATE = "该账户已停用";
 	public final static String USER_NOT_FORBIDDEN = "登录失败，请联系管理员!";
 	public final static String USER_HAS_NO_ROLE = "未获得用户的角色信息";
 	public final static String USER_HAS_NO_TENANT = "未获得用户的租户信息";

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/excel/PjShipStockDetails.java

@@ -110,4 +110,23 @@ public class PjShipStockDetails implements Serializable {
 	 */
 	private String tenantId;
 
+	/**
+	 * 租户id
+	 */
+	private String dot;
+
+	/**
+	 * 规格型号
+	 */
+	private String specificationAndModel;
+	/**
+	 * 花纹
+	 */
+	private String brandItem;
+
+	/**
+	 * 商品名称
+	 */
+	private String goodsName;
+
 }

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/entity/User.java

@@ -127,4 +127,9 @@ public class User extends TenantEntity {
 	 * 公众号openid
 	 */
 	private String oaOpenId;
+
+	/**
+	 * 运行状态(0正常，1禁用)
+	 */
+	private String workingStatus;
 }

blade-service/blade-land/src/main/java/org/springblade/land/service/impl/OrderServiceImpl.java

@@ -303,29 +303,29 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 		pages.getRecords().forEach(record -> {
 			if (!ObjectUtil.isEmpty(record.getCorpId())) {
 				if (ObjectUtil.isNotEmpty(corpsList)) {
-					record.setCorpName(corpsList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get().getCname());
-					record.setCorpShortName(corpsList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().get().getShortName());
+					record.setCorpName(corpsList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().orElse(new CorpsDesc()).getCname());
+					record.setCorpShortName(corpsList.stream().filter(e -> e.getId().equals(record.getCorpId())).findFirst().orElse(new CorpsDesc()).getShortName());
 				}
 			}
 
 			if (!ObjectUtil.isEmpty(record.getCreateUser())) {
 				if (ObjectUtil.isNotEmpty(createUserList)) {
-					record.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(record.getCreateUser())).findFirst().get().getRealName());
+					record.setCreateUserName(createUserList.stream().filter(e -> e.getId().equals(record.getCreateUser())).findFirst().orElse(new User()).getRealName());
 				}
 			}
 			if (!ObjectUtil.isEmpty(record.getSalesman())) {
 				if (ObjectUtil.isNotEmpty(salesmanList)) {
-					record.setSalesmanName(salesmanList.stream().filter(e -> e.getId().equals(record.getSalesman())).findFirst().get().getRealName());
+					record.setSalesmanName(salesmanList.stream().filter(e -> e.getId().equals(record.getSalesman())).findFirst().orElse(new User()).getRealName());
 				}
 			}
 			if (!ObjectUtil.isEmpty(record.getDispatcher())) {
 				if (ObjectUtil.isNotEmpty(dispatcherList)) {
-					record.setDispatcherName(dispatcherList.stream().filter(e -> e.getId().equals(record.getDispatcher())).findFirst().get().getRealName());
+					record.setDispatcherName(dispatcherList.stream().filter(e -> e.getId().equals(record.getDispatcher())).findFirst().orElse(new User()).getRealName());
 				}
 			}
 			if (!ObjectUtil.isEmpty(record.getDispatchDept())) {
 				if (ObjectUtil.isNotEmpty(dispatchDeptList)) {
-					record.setDispatchDeptName(dispatchDeptList.getData().stream().filter(e -> e.getId().equals(record.getDispatchDept())).findFirst().get().getDeptName());
+					record.setDispatchDeptName(dispatchDeptList.getData().stream().filter(e -> e.getId().equals(record.getDispatchDept())).findFirst().orElse(new Dept()).getDeptName());
 				}
 			}
 
@@ -552,7 +552,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			.eq(LandOrder::getShippingMode, "散货")
 			.eq(LandOrder::getIsDeleted, 0);
 		if (AuthUtil.getUserRole().equals(LandConst.MOLD_MANAGER)) {
-			orderQueryWrapper.eq(LandOrder::getCorpId, 1508356683997454337l);
+			orderQueryWrapper.eq(LandOrder::getCorpId, 1508356683997454337L);
 		}
 		orderQueryWrapper.between(StringUtil.isNotBlank(order.getBeginArrivalTime()) && StringUtil.isNotBlank(order.getEndArrivalTime()), LandOrder::getArrivalTime, order.getBeginArrivalTime(), order.getEndArrivalTime());
 		;
@@ -817,7 +817,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, LandOrder> implem
 			.between(StringUtil.isNotBlank(order.getBeginCrateTime()) && StringUtil.isNotBlank(order.getEndCrateTime()), LandOrder::getCreateTime, order.getBeginCrateTime(), order.getEndCrateTime());//制单日期
 
 		if (AuthUtil.getUserRole().equals(LandConst.MOLD_MANAGER)) {
-			orderQueryWrapper.eq(LandOrder::getCorpId, 1508356683997454337l);
+			orderQueryWrapper.eq(LandOrder::getCorpId, 1508356683997454337L);
 		}
 
 		orderQueryWrapper.orderByDesc(LandOrder::getArrivalTime);

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/excel/PjStockDetails.java

@@ -0,0 +1,118 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.purchase.sales.excel;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 配件收发货表实体类
+ *
+ * @author BladeX
+ * @since 2023-04-21
+ */
+@Data
+public class PjStockDetails implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 业务编号
+	 */
+	private String id;
+
+	/**
+	 * 业务编号
+	 */
+	@ApiModelProperty(value = "业务编号")
+	private String billno;
+
+	/**
+	 * 名称
+	 */
+	@ApiModelProperty(value = "名称")
+	private String corpName;
+
+	/**
+	 * 名称
+	 */
+	private Long corpId;
+
+	/**
+	 * 状态
+	 */
+	@ApiModelProperty(value = "状态")
+	private String statusName;
+
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String bizTypeName;
+	/**
+	 * 增加
+	 */
+	@ApiModelProperty(value = "增加")
+	private BigDecimal addSendTotalNum;
+
+	/**
+	 * 减少
+	 */
+	@ApiModelProperty(value = "减少")
+	private BigDecimal SubSendTotalNum;
+
+	/**
+	 * 业务日期
+	 */
+	@ApiModelProperty(value = "业务日期")
+	private Date updateTime;
+
+	/**
+	 * 业务日期
+	 */
+	@ApiModelProperty(value = "业务日期")
+	private List<String> businesDateList;
+
+
+	/**
+	 * 商品id
+	 */
+	private Long goodsId;
+
+
+	/**
+	 * 仓库id
+	 */
+	private Long storageId;
+
+	/**
+	 * 所属公司
+	 */
+	private String salesCompanyId;
+
+	/**
+	 * 租户id
+	 */
+	private String tenantId;
+
+}

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.java

@@ -381,4 +381,6 @@ public interface OrderMapper extends BaseMapper<Order> {
 										@Param("billType")String billType);
 
 	int corpAnalysisDWT(@Param("order")Order order);
+
+    List<PjStockDetails> stockDataDetails(@Param("order") PjStockDetails pjStockDetails);
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -3679,6 +3679,92 @@ ORDER BY
             AND busines_date between date_sub(now(),interval 6 month) and now();
         </if>
     </select>
+    <select id="stockDataDetails" resultType="org.springblade.purchase.sales.excel.PjStockDetails">
+        SELECT
+            ps.id AS id,
+            ps.sys_no AS billno,
+            bcd.cname AS corpName,
+            ps.STATUS AS statusName,
+            ps.busines_date AS updateTime,
+            CASE
+                ps.STATUS
+                WHEN '0' THEN
+                    '录入'
+                WHEN '1' THEN
+                    '未付'
+                WHEN '2' THEN
+                    '已付'
+                WHEN '3' THEN
+                    '待发货'
+                WHEN '4' THEN
+                    '已发货'
+                WHEN '5' THEN
+                    '待收货'
+                WHEN '6' THEN
+                    '已收货'
+                WHEN '7' THEN
+                    '退款完成'
+                WHEN '8' THEN
+                    '已取消'
+                WHEN '9' THEN
+                    '审核提交'
+                WHEN '10' THEN
+                    '审批中'
+                WHEN '11' THEN
+                    '审批驳回'
+                WHEN '12' THEN
+                    '退货中'
+                WHEN '13' THEN
+                    '退款售后'
+                END AS statusName,
+            CASE
+                ps.bill_type
+                WHEN 'XS' THEN
+                    '销售'
+                WHEN 'CG' THEN
+                    '采购'
+                END AS bizTypeName,
+            CASE
+                ps.bill_type
+                WHEN 'XS' THEN
+                    IF
+                        ( SUM( psi.storage_in_quantity ), SUM( psi.storage_in_quantity ), 0 ) ELSE 0
+                END AS SubSendTotalNum,
+            CASE
+                ps.bill_type
+                WHEN 'CG' THEN
+                    IF
+                        ( SUM( psi.storage_in_quantity ), SUM( psi.storage_in_quantity ), 0 ) ELSE 0
+                END AS addSendTotalNum
+        FROM
+                `business_order_items` psi
+                LEFT JOIN business_order ps ON ps.id = psi.pid
+                LEFT JOIN basic_corps_desc bcd on ps.corp_id = bcd.id
+        WHERE
+            ps.is_deleted = '0'
+          AND FIND_IN_SET( ps.bill_type, 'XS,CG' )
+        AND ps.tenant_id = #{order.tenantId}
+        <if test="order.storageId!=null">
+            and ps.storage_id = #{order.storageId}
+        </if>
+        <if test="order.goodsId!=null">
+            and psi.item_id = #{order.goodsId}
+        </if>
+        <if test="order.corpId!=null">
+            and ps.corp_id = #{order.corpId}
+        </if>
+        <if test="order.billno!=null and order.billno!=''">
+            and ps.sys_no = like CONCAT(CONCAT('%', #{order.billno}), '%')
+        </if>
+        <if test="order.businesDateList != null and order.businesDateList[0] != null and order.businesDateList[0]!= ''">
+            and po.busines_date &gt;= #{order.businesDateList[0]}
+        </if>
+        <if test="order.businesDateList != null and order.businesDateList[1] != null and order.businesDateList[1]!= ''">
+            and po.busines_date &lt;= #{order.businesDateList[1]}
+        </if>
+        GROUP BY
+            ps.sys_no
+    </select>
 
     <update id="updateStockGoods" parameterType="org.springblade.stock.entity.StockGoods">
         UPDATE business_stock_goods SET surplus_route_quantity = #{surplusRouteQuantity},locking_quantity = #{lockingQuantity} WHERE tenant_id = #{tenantId} AND id = #{id} AND is_deleted = 0

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/partsapp/AppPartsController.java

@@ -30,6 +30,7 @@ import org.springblade.finance.vojo.Acc;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.entity.OrderItems;
 import org.springblade.purchase.sales.excel.AnalysisDetailsExcel;
+import org.springblade.purchase.sales.excel.PjStockDetails;
 import org.springblade.purchase.sales.service.IOrderItemsService;
 import org.springblade.purchase.sales.service.IOrderService;
 import org.springblade.purchase.sales.vo.OrderVO;
@@ -666,4 +667,17 @@ public class AppPartsController extends BladeController {
 		return orderService.returnGoodsRefund(order);
 	}
 
+
+	/**
+	 * 库存账明细
+	 */
+	@GetMapping("/stockDataDetails")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入order")
+	public R<List<PjStockDetails>> stockDataDetails(PjStockDetails pjStockDetails) {
+		pjStockDetails.setTenantId(AuthUtil.getTenantId());
+		List<PjStockDetails> pages = orderService.stockDataDetails(pjStockDetails);
+		return R.data(pages);
+	}
+
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderService.java

@@ -532,4 +532,6 @@ public interface IOrderService extends IService<Order> {
 	List<Order> turnoverAnalysisDWTList(String billType,String type, String statusDate, String endDate);
 
 	int corpAnalysisDWT(Order order);
+
+    List<PjStockDetails> stockDataDetails(PjStockDetails pjStockDetails);
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -7134,6 +7134,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		return baseMapper.corpAnalysis(order);
 	}
 
+	@Override
+	public List<PjStockDetails> stockDataDetails(PjStockDetails pjStockDetails) {
+		return baseMapper.stockDataDetails(pjStockDetails);
+	}
+
 	/**
 	 * 状态统计
 	 * <p>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -324,6 +324,9 @@ public class GoodsDescController extends BladeController {
 
 		lambdaQueryWrapper.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjGoodsDesc::getIsDeleted, 0)
+			.eq(ObjectUtils.isNotNull(goods.getExplosionProof()), PjGoodsDesc::getExplosionProof, goods.getExplosionProof())
+			.eq(ObjectUtils.isNotNull(goods.getOriginalFactory()), PjGoodsDesc::getOriginalFactory, goods.getOriginalFactory())
+			.eq(ObjectUtils.isNotNull(goods.getSelfRecovery()), PjGoodsDesc::getSelfRecovery, goods.getSelfRecovery())
 			.eq(ObjectUtils.isNotNull(goods.getEnableOrNot()), PjGoodsDesc::getEnableOrNot, goods.getEnableOrNot());//状态;
 		if (ObjectUtil.isNotEmpty(goods.getCname())) {//商品名称
 			lambdaQueryWrapper.and(i -> i.like(PjGoodsDesc::getCname, goods.getCname()).or().like(PjGoodsDesc::getCnameInt, goods.getCname()));
@@ -361,6 +364,9 @@ public class GoodsDescController extends BladeController {
 		LambdaQueryWrapper<PjGoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
 			.eq(PjGoodsDesc::getIsDeleted, 0)
+			.eq(ObjectUtils.isNotNull(goods.getExplosionProof()), PjGoodsDesc::getExplosionProof, goods.getExplosionProof())
+			.eq(ObjectUtils.isNotNull(goods.getOriginalFactory()), PjGoodsDesc::getOriginalFactory, goods.getOriginalFactory())
+			.eq(ObjectUtils.isNotNull(goods.getSelfRecovery()), PjGoodsDesc::getSelfRecovery, goods.getSelfRecovery())
 			.eq(ObjectUtils.isNotNull(goods.getEnableOrNot()), PjGoodsDesc::getEnableOrNot, goods.getEnableOrNot());//状态;
 		if (ObjectUtil.isNotEmpty(goods.getCname())) {//商品名称
 			lambdaQueryWrapper.and(i -> i.like(PjGoodsDesc::getCname, goods.getCname()).or().like(PjGoodsDesc::getCnameInt, goods.getCname()));
@@ -404,7 +410,11 @@ public class GoodsDescController extends BladeController {
 			.eq(ObjectUtils.isNotNull(goods.getEnableOrNot()), PjGoodsDesc::getEnableOrNot, goods.getEnableOrNot())
 			.eq(ObjectUtils.isNotNull(goods.getBrandId()), PjGoodsDesc::getBrandId, goods.getBrandId())
 			.eq(ObjectUtils.isNotNull(goods.getSpecificationAndModel()), PjGoodsDesc::getSpecificationAndModel, goods.getSpecificationAndModel())
-			.eq(ObjectUtils.isNotNull(goods.getBrandItem()), PjGoodsDesc::getBrandItem, goods.getBrandItem());
+			.eq(ObjectUtils.isNotNull(goods.getBrandItem()), PjGoodsDesc::getBrandItem, goods.getBrandItem())
+			.eq(ObjectUtils.isNotNull(goods.getExplosionProof()), PjGoodsDesc::getExplosionProof, goods.getExplosionProof())
+			.eq(ObjectUtils.isNotNull(goods.getOriginalFactory()), PjGoodsDesc::getOriginalFactory, goods.getOriginalFactory())
+			.eq(ObjectUtils.isNotNull(goods.getSelfRecovery()), PjGoodsDesc::getSelfRecovery, goods.getSelfRecovery())
+		;
 		if (ObjectUtil.isNotEmpty(goods.getCname())) {//商品名称
 			lambdaQueryWrapper.and(i -> i.like(PjGoodsDesc::getCname, goods.getCname()).or().like(PjGoodsDesc::getCnameInt, goods.getCname()));
 		}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/settlement/service/impl/SettlementServiceImpl.java

@@ -153,6 +153,9 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, PjSettl
 			List<PjOrder> orderArrayList = new ArrayList<>();
 			BigDecimal thisAmount = new BigDecimal("0.00");
 			for (PjSettlementItems item : settlement.getSettlementItemsList()) {
+				if (item.getAccountsAmount().compareTo(item.getThisAmount()) < 0){
+					throw new RuntimeException("结算金额大于合同金额，结算失败");
+				}
 				item.setUpdateTime(new Date());
 				item.setUpdateUser(AuthUtil.getUserId());
 				item.setSettlmentAmount(item.getThisAmount());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/mapper/ShipMapper.xml

@@ -45,8 +45,11 @@
             ps.id as id,
             ps.billno AS billno,
             ps.customer_name AS corpName,
-            ps.status_name,
+            ps.status_name AS statusName,
             ps.update_time AS updateTime,
+            pgd.brand_item AS brandItem,
+            pgd.cname AS goodsName,
+            pgd.specification_and_model AS specificationAndModel,
             CASE
                 ps.biz_type_name
                 WHEN 'FHGD' THEN
@@ -72,12 +75,14 @@
                         ( SUM( psi.send_num ), SUM( psi.send_num ), 0 ) ELSE 0
                 END AS addSendTotalNum
         FROM
-            `pjpf_ship` ps
-                LEFT JOIN pjpf_ship_items psi ON ps.id = psi.pid
+            pjpf_ship_items psi
+            LEFT JOIN pjpf_ship ps ON ps.id = psi.pid
+            LEFT JOIN pjpf_goods_desc pgd ON pgd.id = psi.goods_id
         WHERE
              ps.is_deleted = '0'
           AND FIND_IN_SET( ps.biz_type_name, 'FHGD,SHGD,TKSHGD' )
             AND ps.tenant_id = #{order.tenantId}
+            and psi.dot = #{order.dot}
         <if test="order.storageId!=null">
             and ps.storage_id = #{order.storageId}
         </if>
@@ -85,7 +90,7 @@
             and psi.goods_id = #{order.goodsId}
         </if>
         <if test="order.salesCompanyId!=null and order.salesCompanyId!=''">
-            and psi.sales_company_id = #{order.salesCompanyId}
+            and ps.sales_company_id = #{order.salesCompanyId}
         </if>
         <if test="order.corpName!=null and order.corpName!=''">
             and ps.customer_name = #{order.corpName}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -89,6 +89,7 @@ public class StockDescController extends BladeController {
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandId()), PjStockDesc::getBrandId, stockDesc.getBrandId())
 			.eq(ObjectUtil.isNotEmpty(stockDesc.getGoodsTypeId()), PjStockDesc::getGoodsTypeId, stockDesc.getGoodsTypeId())
+			.like(ObjectUtil.isNotEmpty(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot())
 			.orderByAsc(PjStockDesc::getCreateTime);
 		if ("0".equals(stockDesc.getWhether())) {
 			lambdaQueryWrapper.ne(PjStockDesc::getStoreInventory, 0);

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

@@ -164,7 +164,11 @@ public class UserController {
 			.eq(User::getIsDeleted, 0);
 
 		if (ObjectUtil.isNotEmpty(userVO.getDeptPid())) {
-			userVO.setRoleAlias("分管调度");
+			if ("1504336886057963521".equals(userVO.getDeptPid())){
+				userVO.setRoleAlias("分管调度");
+			}else{
+				userVO.setRoleAlias("大件调度");
+			}
 		}
 		if (StringUtil.isNotBlank(userVO.getRoleAlias())) {
 			R<Long> roleR = sysClient.getRoleByAlias(userVO.getRoleAlias());

blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml

@@ -25,6 +25,7 @@
         <result column="role_id" property="roleId"/>
         <result column="dept_id" property="deptId"/>
         <result column="post_id" property="postId"/>
+        <result column="working_status" property="workingStatus"/>
     </resultMap>
 
     <select id="selectUserPage" resultMap="userResultMap">
@@ -66,7 +67,7 @@
         FROM
             blade_user
         WHERE
-            tenant_id = #{param1} and account = #{param2} and is_deleted = 0
+            tenant_id = #{param1} and account = #{param2} and is_deleted = 0 and working_status = '0'
     </select>
 
     <select id="exportUser" resultType="org.springblade.system.user.excel.UserExcel">