sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/service/impl/BackApplyServiceImpl.java

@@ -52,7 +52,6 @@ public class BackApplyServiceImpl implements BackApplyService {
     @Override
     public List<BackApplyInfo> getBackAuditList(BackApplyInfo bean) {
         Set<String> roles = SecurityUtils.getLoginUser().getRoles();
-        Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
         if (roles.contains("admin")) {
             //管理员可以看到所有退料申请
             return backApplyMapper.getBackApplyListByAdmin(bean);
@@ -60,22 +59,18 @@ public class BackApplyServiceImpl implements BackApplyService {
         List<BackApplyInfo> backApplyInfos = new ArrayList<>();
         List<BackApplyInfo> backApplyListByAdmin = backApplyMapper.getBackApplyListByAdmin(bean);
         //机具分公司只能看到机具公司的退料
-        if (CollUtil.isNotEmpty(backApplyListByAdmin)) {
-            if (roles.contains("sgb") || roles.contains("jjfgs")) {
-                for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
-                    if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) {
-                        backApplyInfos.add(backApplyInfo);
-                    }
+        if (CollUtil.isNotEmpty(backApplyListByAdmin) && roles.contains("sgb")) {
+            for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
+                if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains("101")) {
+                    backApplyInfos.add(backApplyInfo);
                 }
             }
         }
         //调试分公司只能看到调试公司的退料
-        if (CollUtil.isNotEmpty(backApplyListByAdmin)) {
-            if (roles.contains("ajb") || roles.contains("tsfgs")) {
-                for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
-                    if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains(String.valueOf(companyId))) {
-                        backApplyInfos.add(backApplyInfo);
-                    }
+        if (CollUtil.isNotEmpty(backApplyListByAdmin) && roles.contains("ajb")) {
+            for (BackApplyInfo backApplyInfo : backApplyListByAdmin) {
+                if (StringUtils.hasText(backApplyInfo.getCompanyId()) && backApplyInfo.getCompanyId().contains("102")) {
+                    backApplyInfos.add(backApplyInfo);
                 }
             }
         }