|
@@ -72,11 +72,10 @@ public class GgController extends BaseController {
|
|
|
addNotEmptyModel(filterList, "pkj", "0", Operator.NEQ);
|
|
|
if (Utils.getCurrentUserSzd().toString().length() >= 4) {
|
|
|
addNotEmptyModel(filterList, "skj", Utils.getCurrentUserSzd()
|
|
|
- .toString().substring(0, 4)
|
|
|
- + ";", Operator.LIKE);
|
|
|
+ .toString().substring(0, 4), Operator.LIKE);
|
|
|
} else {
|
|
|
addNotEmptyModel(filterList, "skj", Utils.getCurrentUserSzd()
|
|
|
- .toString() + ";", Operator.LIKE);
|
|
|
+ .toString(), Operator.LIKE);
|
|
|
}
|
|
|
}
|
|
|
addNotEmptyModel(filterList, "recordStatus",
|
|
@@ -107,11 +106,10 @@ public class GgController extends BaseController {
|
|
|
addNotEmptyModel(filterList, "pkj", "0", Operator.NEQ);
|
|
|
if (Utils.getCurrentUserSzd().toString().length() >= 4) {
|
|
|
addNotEmptyModel(filterList, "skj", Utils.getCurrentUserSzd()
|
|
|
- .toString().substring(0, 4)
|
|
|
- + ";", Operator.LIKE);
|
|
|
+ .toString().substring(0, 4), Operator.LIKE);
|
|
|
} else {
|
|
|
addNotEmptyModel(filterList, "skj", Utils.getCurrentUserSzd()
|
|
|
- .toString() + ";", Operator.LIKE);
|
|
|
+ .toString(), Operator.LIKE);
|
|
|
}
|
|
|
}
|
|
|
addNotEmptyModel(filterList, "lkr", lkr, PredicateModel.Operator.LIKE);
|
|
@@ -146,7 +144,7 @@ public class GgController extends BaseController {
|
|
|
&& null != Utils.getCurrentUser().getSzd()) {
|
|
|
entity.setSzd(Utils.getCurrentUser().getSzd());
|
|
|
entity.setPkj("1");
|
|
|
- entity.setSkj(Utils.getCurrentUserSzd() + ";");
|
|
|
+ entity.setSkj(Utils.getCurrentUserSzd() + "");
|
|
|
} else {
|
|
|
entity.setPkj("0");
|
|
|
}
|
|
@@ -235,8 +233,10 @@ public class GgController extends BaseController {
|
|
|
entity.setPkj("2");
|
|
|
entity.setSsqy(Constants.SSQY_ALL);
|
|
|
for (CodeEntity city : cityList) {
|
|
|
- if (null == entity.getSkj() || entity.getSkj().indexOf(city.getId().toString()) == -1) {
|
|
|
- entity.setSkj((entity.getSkj()==null?"":entity.getSkj()) + city.getId() + ";");
|
|
|
+ if (null == entity.getSkj()
|
|
|
+ || entity.getSkj().indexOf(city.getId().toString()) == -1) {
|
|
|
+ entity.setSkj(entity.getSkj() == null ? (city.getId() + "")
|
|
|
+ : (";" + entity.getSkj() + city.getId()));
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
@@ -379,9 +379,9 @@ public class GgController extends BaseController {
|
|
|
*/
|
|
|
public BusinessContext listNeed(String title, String lkr) {
|
|
|
BusinessContext bc = new BusinessContext();
|
|
|
- List<GgEntity> list = ggService.queryNeed(title, lkr);
|
|
|
+ List<GgEntity> list = ggService.queryNeed(title, lkr);
|
|
|
bc.setResult(list);
|
|
|
return bc;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|