保管员管理

src/main/java/com/chinaitop/depot/basic/controller/BasicKeeperController.java

@@ -502,10 +502,10 @@ public class BasicKeeperController {
 				}
 				list = keeperService.findCondition(keeperExample);
 			}else{
-					if (null != pageNum && null != pageSize) {
-						PageHelper.startPage(pageNum, pageSize);
-					}
-					list = keeperService.getKeeperListByNameAndHouseId(keeperName, storehouseId);
+				if (null != pageNum && null != pageSize) {
+					PageHelper.startPage(pageNum, pageSize);
+				}
+				list = keeperService.getKeeperListByNameAndHouseId(keeperName, storehouseId);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();

src/main/java/com/chinaitop/depot/basic/controller/BasicStorehouseController.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
@@ -389,47 +390,27 @@ public class BasicStorehouseController {
 			orgId = Integer.parseInt(user.get("orgId") == null?"":user.get("orgId").toString());
 			userId = Integer.parseInt(user.get("userId") == null?"":user.get("userId").toString());
 		}
-		BasicKeeperExample keeperExample = new BasicKeeperExample();
-		BasicKeeperExample.Criteria keeperCriteria=keeperExample.createCriteria();
 
-		List<BasicStorehouse> storehouseList=new ArrayList<BasicStorehouse>();
-		try {
-			//5417保管员角色编号Id  enumCode对应的就是保管员的id
-			//basicEnum = enumService.findByParmeryKeyEnum(5417);
-			//keeperId=basicEnum.getEnumcode();//保管员角色对应的id
-			//查询当前正常用户的角色为保管员
-			keeperCriteria.andUserIdEqualTo(userId);
-			keeperCriteria.andDelFlagEqualTo(1);
-			//keeperCriteria.andPostTypeEqualTo(Integer.valueOf(keeperId));
-			List<BasicKeeper> keeperList = keeperService.findCondition(keeperExample);
-			if(keeperList.size()>0 && keeperList != null){
-				BasicKeeperHouseExample keeperHouseExample = new BasicKeeperHouseExample();
-				BasicKeeperHouseExample.Criteria Criteria=keeperHouseExample.createCriteria();
-				Criteria.andKeeperIdEqualTo(Integer.valueOf(keeperList.get(0).getId()));
-				Criteria.andOrgIdEqualTo(orgId);
-				//2.1查询出该保管员管理的哪些仓房
-				List<BasicKeeperHouse> keeperHouseList = keeperHouseService.findCondition(keeperHouseExample);
+		List<BasicStorehouse> list = null;
 
+		try {
+			BasicKeeperHouseExample keeperHouseExample = new BasicKeeperHouseExample();
+			BasicKeeperHouseExample.Criteria keeperhouseCriteria = keeperHouseExample.createCriteria();
+			keeperhouseCriteria.andKeeperIdEqualTo(userId);
+			List<BasicKeeperHouse> keeperHouseList = keeperHouseService.findCondition(keeperHouseExample);
+			if (null != keeperHouseList && keeperHouseList.size() > 0) {
+				List<Integer> storeList = keeperHouseList.stream().map(BasicKeeperHouse::getHouseId).collect(Collectors.toList());
 				BasicStorehouseExample example = new BasicStorehouseExample();
 				Criteria Cri = example.createCriteria();
-
-				BasicStorehouse basicStorehouse=null;
-				for (BasicKeeperHouse be : keeperHouseList) {
-					Integer houseId=be.getHouseId();
-					Cri.andStorehouseIdEqualTo(houseId);
-					try{
-						//2.2根据仓房id查询对应的仓房信息
-						basicStorehouse = basicStorehouseService.findByPrimary(houseId);
-						storehouseList.add(basicStorehouse);
-					}catch (Exception ex){
-						ex.printStackTrace();
-					}
-				}
+				Cri.andStorehouseIdIn(storeList);
+				example.setOrderByClause("id");
+				list = basicStorehouseService.findBasicStorehouse(example);
 			}
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
-		return storehouseList;
+		return list;
 	}
 
 	/**