From df4bc30a1551a1f7e4e1a51db54474e354c4dc39 Mon Sep 17 00:00:00 2001
From: erzhongxmu <erzhongxmu@hotmail.com>
Date: Fri, 18 Mar 2022 17:35:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=BF=9B=E8=B4=A7=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wm/controller/WmImNoticeHController.java  |  4 ----
 .../service/impl/WmImNoticeHServiceImpl.java  | 20 ++++---------------
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java b/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
index 2cd2c364..fbc5b8b9 100644
--- a/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
+++ b/src/main/java/com/zzjee/wm/controller/WmImNoticeHController.java
@@ -2353,15 +2353,12 @@ public class WmImNoticeHController extends BaseController {
             for (WmImNoticeIEntity wmImNoticeIEntity : wmImNoticeIList) {
                 if(!StringUtil.isEmpty(wmImNoticeIEntity.getGoodsCode())){
                     try {
-
-
                         String goodsId = wmImNoticeIEntity.getGoodsCode().split("-")[0];
                         if(goodsId.endsWith("l")){
                             goodsId = goodsId.substring(0,goodsId.lastIndexOf("l"));
                         }
                         MvGoodsEntity mvgoods = systemService.findUniqueByProperty(MvGoodsEntity.class,"goodsId",goodsId);
 //					String date[]=wmImNoticeIEntity.getGoodsCode().split("-");
-
                         long hiti = 0;
                         try {
                             if(StringUtil.isEmpty(wmImNoticeIEntity.getBinPlan())){
@@ -2370,7 +2367,6 @@ public class WmImNoticeHController extends BaseController {
                             }
                         } catch (Exception e) {
                         }
-
                         wmImNoticeIEntity.setGoodsCode(mvgoods.getGoodsCode());
                         wmImNoticeIEntity.setGoodsName(mvgoods.getShpMingCheng());
                     } catch (Exception e) {
diff --git a/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java b/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java
index b433d632..336ee75e 100644
--- a/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java
+++ b/src/main/java/com/zzjee/wm/service/impl/WmImNoticeHServiceImpl.java
@@ -9,6 +9,7 @@ import com.zzjee.wm.entity.WmImNoticeHEntity;
 import com.zzjee.wm.entity.WmImNoticeIEntity;
 import com.zzjee.wm.entity.WmInQmIEntity;
 
+import org.jeecgframework.web.system.sms.util.Constants;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -120,22 +121,9 @@ public class WmImNoticeHServiceImpl extends CommonServiceImpl implements WmImNot
 				}else{
 					wmImNoticeI.setBinPre("N");
 					wmImNoticeI.setGoodsQmCount("0");
-					TSUser user = ResourceUtil.getSessionUserName();
-					String roles = "";
-					if (user != null) {
-						List<TSRoleUser> rUsers = this.findByProperty(TSRoleUser.class, "TSUser.id", user.getId());
-						for (TSRoleUser ru : rUsers) {
-							TSRole role = ru.getTSRole();
-							roles += role.getRoleCode() + ",";
-						}
-						if (roles.length() > 0) {
-							roles = roles.substring(0, roles.length() - 1);
-						}
-						if(roles.equals("CUS")){
-							wmImNoticeI.setBinPre("I");
-						}
-					}
-
+                   if(wmImNoticeH.getImSta().equals(Constants.wm_sta0)){
+					   wmImNoticeI.setBinPre("I");
+				   }
 					wmImNoticeI.setImNoticeId(wmImNoticeH.getNoticeId());
 					wmImNoticeI.setImBeizhu(wmImNoticeH.getImBeizhu());
 					wmImNoticeI.setImCusCode(wmImNoticeH.getImCusCode());