提交

bladex-saas-project/saas-business-tradeerp/src/main/java/com/fjhx/shipment/mapper/ShipmentPackingProductMapper.xml

@@ -209,6 +209,7 @@
         <where>
             t1.tenant_id = #{tenantId}
             AND t1.batch_code = #{batchCode}
+            AND tepc.purchase_status != '999'
         </where>
         ORDER BY
             t1.create_time ASC

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

@@ -43,31 +43,18 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.jackson.JsonUtil;
 import org.springblade.core.tool.support.Kv;
-import org.springblade.core.tool.utils.BeanUtil;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.core.tool.utils.DesUtil;
-import org.springblade.core.tool.utils.DigestUtil;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.core.tool.utils.Md5Utils;
-import org.springblade.core.tool.utils.ObjectUtil;
-import org.springblade.core.tool.utils.StringPool;
-import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.core.tool.utils.*;
 import org.springblade.system.cache.DictCache;
 import org.springblade.system.cache.ParamCache;
 import org.springblade.system.cache.SysCache;
+import org.springblade.system.constant.RoleConstant;
 import org.springblade.system.entity.Dept;
 import org.springblade.system.entity.Role;
 import org.springblade.system.entity.Tenant;
 import org.springblade.system.enums.DictEnum;
 import org.springblade.system.feign.ISysClient;
 import org.springblade.system.user.cache.UserCache;
-import org.springblade.system.user.entity.User;
-import org.springblade.system.user.entity.UserApp;
-import org.springblade.system.user.entity.UserDept;
-import org.springblade.system.user.entity.UserInfo;
-import org.springblade.system.user.entity.UserOauth;
-import org.springblade.system.user.entity.UserOther;
-import org.springblade.system.user.entity.UserWeb;
+import org.springblade.system.user.entity.*;
 import org.springblade.system.user.enums.UserEnum;
 import org.springblade.system.user.excel.UserExcel;
 import org.springblade.system.user.mapper.UserMapper;
@@ -80,15 +67,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -977,7 +956,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
         String[] roleIdsArr = AuthUtil.getUserRoleId().split(",");
         //如果是业务总监，则只能查看业务员
         if (StringUtils.containsAny(UserConstants.BUSINESS_DIRECTOR_ROLE_ID + "", roleIdsArr)) {
-            roleIds = Arrays.asList(String.valueOf(org.springblade.system.constant.RoleConstant.RoleType.SALESMAN));
+            roleIds = Collections.singletonList(String.valueOf(RoleConstant.RoleType.SALESMAN));
         }
         return baseMapper.getJoinMailBoxByRoleIds(tenantId, roleIds);
     }