Commit b242549c authored by tangwei's avatar tangwei

修改app bug

parent abf66589
...@@ -463,8 +463,8 @@ public class PlanTaskController extends AbstractBaseController { ...@@ -463,8 +463,8 @@ public class PlanTaskController extends AbstractBaseController {
try { try {
HashMap<String, Object> params = new HashMap<String, Object>(); HashMap<String, Object> params = new HashMap<String, Object>();
ReginParams reginParams = getSelectedOrgInfo(); ReginParams reginParams = getSelectedOrgInfo();
String loginOrgCode = getOrgCode(reginParams); String loginOrgCode =reginParams.getPersonIdentity().getCompanyBizOrgCode();
params.put("orgCode", loginOrgCode); params.put("bizOrgCode", loginOrgCode);
params.put("pointNo", pointNo); params.put("pointNo", pointNo);
Point point = pointService.queryPointByPointNo(params); Point point = pointService.queryPointByPointNo(params);
// 1.通用校验 // 1.通用校验
......
...@@ -1026,8 +1026,8 @@ public class PointServiceImpl implements IPointService { ...@@ -1026,8 +1026,8 @@ public class PointServiceImpl implements IPointService {
if (!ObjectUtils.isEmpty(params.get("pointNo"))) { if (!ObjectUtils.isEmpty(params.get("pointNo"))) {
predicate.add(cb.equal(root.get("pointNo").as(String.class), params.get("pointNo"))); predicate.add(cb.equal(root.get("pointNo").as(String.class), params.get("pointNo")));
} }
if (!ObjectUtils.isEmpty(params.get("orgCode"))) { if (!ObjectUtils.isEmpty(params.get("bizOrgCode"))) {
predicate.add(cb.equal(root.get("orgCode").as(String.class), params.get("orgCode").toString())); predicate.add(cb.like(root.get("bizOrgCode").as(String.class), params.get("bizOrgCode").toString()+"%"));
} }
Predicate[] pre = new Predicate[predicate.size()]; Predicate[] pre = new Predicate[predicate.size()];
return query.where(predicate.toArray(pre)).getRestriction(); return query.where(predicate.toArray(pre)).getRestriction();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment