luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ariesy 增加gfsh条件

Browse Source
release
yefei 2 years ago
parent 2a1a2d4d6d
commit 92838820c9
1 changed files with 18 additions and 18 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 36
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java

36
dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtInvoicePoolController.java
Unescape View File

@ -57,15 +57,15 @@ public class ExtInvoicePoolController extends AbstractController {
pramsMap.put("dbName", getUserInfo().getDbName());
List<String> gfshList = new ArrayList<>();
// if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
// gfshList.add(pramsMap.get("gfsh").toString());
// } else {
// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
// if (gfshList.size() == 0) {
// return ResponseEntity.ok(R.ok().put("data", ""));
// }
// }
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
gfshList.add(pramsMap.get("gfsh").toString());
} else {
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
if (gfshList.size() == 0) {
return ResponseEntity.ok(R.ok().put("data", ""));
}
}
// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
boolean flag = checkList(gfshList);
if (flag){
pramsMap.put("sign","88");
@ -230,16 +230,16 @@ public class ExtInvoicePoolController extends AbstractController {
pramsMap.put("dbName", getUserInfo().getDbName());
List<String> gfshList = new ArrayList<>();
// if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
// gfshList.add(pramsMap.get("gfsh").toString());
// } else {
// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
// if (gfshList.size() == 0) {
// return ResponseEntity.ok(R.ok().put("data", ""));
// }
// }
if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
gfshList.add(pramsMap.get("gfsh").toString());
} else {
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
if (gfshList.size() == 0) {
return ResponseEntity.ok(R.ok().put("data", ""));
}
}
gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
// gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
boolean flag = checkList(gfshList);
if (flag){
pramsMap.put("sign","88");

Write Preview
Loading…
Cancel
Save