lvzhikai пре 4 година
родитељ
комит
e5c82f1b40

+ 2 - 2
src/main/java/com/chinaitop/depot/keeperAccount/controller/StorageAccountRecordController.java

@@ -64,10 +64,10 @@ public class StorageAccountRecordController {
64
     	@ApiImplicitParam(name="rq", value="日期", paramType="query"),
64
     	@ApiImplicitParam(name="rq", value="日期", paramType="query"),
65
     	@ApiImplicitParam(name="accountType", value="记账类型", paramType="query")
65
     	@ApiImplicitParam(name="accountType", value="记账类型", paramType="query")
66
     })
66
     })
67
-	public Map<String, Object> edit(String houseId, String wareId, Integer hwxz, Integer lspz, String rq, Integer accountType) {
67
+	public Map<String, Object> edit(HttpServletRequest request, String houseId, String wareId, Integer hwxz, Integer lspz, String rq, Integer accountType) {
68
 		Map<String, Object> map = new HashMap<String, Object>();
68
 		Map<String, Object> map = new HashMap<String, Object>();
69
 		
69
 		
70
-		map = recordService.selectOrCheckStorageAccountRecord(houseId, wareId, hwxz, lspz, rq, accountType, map);
70
+		map = recordService.selectOrCheckStorageAccountRecord(request, houseId, wareId, hwxz, lspz, rq, accountType, map);
71
 
71
 
72
 		return map;
72
 		return map;
73
 	}
73
 	}

+ 1 - 1
src/main/java/com/chinaitop/depot/keeperAccount/service/StorageAccountRecordService.java

@@ -47,7 +47,7 @@ public interface StorageAccountRecordService {
47
 	 * @param map 返回对象
47
 	 * @param map 返回对象
48
 	 * @return
48
 	 * @return
49
 	 */
49
 	 */
50
-	Map<String, Object> selectOrCheckStorageAccountRecord(String houseId, String wareId, Integer hwxz, Integer lspz,
50
+	Map<String, Object> selectOrCheckStorageAccountRecord(HttpServletRequest request, String houseId, String wareId, Integer hwxz, Integer lspz,
51
 			String rq, Integer accountType, Map<String, Object> map);
51
 			String rq, Integer accountType, Map<String, Object> map);
52
 
52
 
53
 	/**
53
 	/**

+ 3 - 1
src/main/java/com/chinaitop/depot/keeperAccount/service/impl/StorageAccountRecordServiceImpl.java

@@ -38,8 +38,9 @@ public class StorageAccountRecordServiceImpl implements StorageAccountRecordServ
38
 	}
38
 	}
39
 
39
 
40
 	@Override
40
 	@Override
41
-	public Map<String, Object> selectOrCheckStorageAccountRecord(String houseId, String wareId, Integer hwxz,
41
+	public Map<String, Object> selectOrCheckStorageAccountRecord(HttpServletRequest request, String houseId, String wareId, Integer hwxz,
42
 			Integer lspz, String rq, Integer accountType, Map<String, Object> map) {
42
 			Integer lspz, String rq, Integer accountType, Map<String, Object> map) {
43
+		String orgId = ObjectUtils.toString(request.getSession().getAttribute("orgId"),"");
43
 		
44
 		
44
 		StorageAccountRecord record = null;
45
 		StorageAccountRecord record = null;
45
 		StorageAccountRecordExample example = new StorageAccountRecordExample();
46
 		StorageAccountRecordExample example = new StorageAccountRecordExample();
@@ -53,6 +54,7 @@ public class StorageAccountRecordServiceImpl implements StorageAccountRecordServ
53
 		criteria.andHwxzEqualTo(hwxz);
54
 		criteria.andHwxzEqualTo(hwxz);
54
 		criteria.andLspzEqualTo(lspz);
55
 		criteria.andLspzEqualTo(lspz);
55
 		criteria.andAccountTypeEqualTo(accountType);
56
 		criteria.andAccountTypeEqualTo(accountType);
57
+		criteria.andOrgIdEqualTo(Integer.parseInt(orgId));
56
 		if (accountType == 1) {
58
 		if (accountType == 1) {
57
 			criteria.andRqEqualTo(rq);
59
 			criteria.andRqEqualTo(rq);
58
 		} else {
60
 		} else {