youxiw2000 / trash · Commits

Commit 92b780cb26a1f710c8b57b25f6487b69b8c69321

Authored by youxiw2000
1 parent 97708218
build: skipped

m

Inline Side-by-side
Showing 1 changed file with 2 additions and 16 deletions
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @92b780c
... ... @@ -75,19 +75,6 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
75 75  
76 76 List<TruckActivate> list = new ArrayList<>();
77 77  
78   - List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
79   - List<String> cList = SecurityUtils.getLoginUser().getUser().getConList();
80   -
81   - if(cArea.size() > 0){
82   - JSONArray jsonArray = redis.getCacheObject("constructionList");
83   - for(Object obj:jsonArray){
84   - JSONObject json = (JSONObject) obj;
85   - if(cArea.indexOf(json.getString("areaCode")) > -1){
86   - cList.add(json.getString("id"));
87   - }
88   - }
89   - }
90   -
91 78 List<String> companys = SecurityUtils.getLoginUser().getUser().getCompanyIds();
92 79 List<String> tList = SecurityUtils.getLoginUser().getUser().getTruckList();
93 80 List<String> areas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
... ... @@ -104,7 +91,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
104 91 }
105 92 }
106 93 }
107   - if (tList.size() > 0 || companys.size() > 0 || cList.size() > 0) {
  94 + if (tList.size() > 0 || companys.size() > 0) {
108 95 List<String> ids = new ArrayList<>();
109 96 for (String str : tList) {
110 97 ids.add(str);
... ... @@ -123,8 +110,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
123 110 }
124 111  
125 112 truckActivate.setIds(ids);
126   - truckActivate.setcIds(cList);
127   - if(ids.size() == 0 && cList.size() == 0){
  113 + if(ids.size() == 0){
128 114 return list;
129 115 }
130 116 list = truckActivateMapper.selectTruckActivateList(truckActivate);
... ...