From bca7de69903612a34c843553ad0b40234bef395c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Sat, 13 Apr 2019 08:58:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=93=8D=E4=BD=9C=E5=91=98?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=91=98=E5=AE=A1=E8=AE=A1=E5=91=98=E4=B8=89?= =?UTF-8?q?=E7=B1=BB=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/BaseService.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 5a25841dd..94c06be31 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -286,15 +286,15 @@ public abstract class BaseService { scopeSql.append(" OR (" + officeAlias + ".parent_id = '" + user.getEntity().getId() + "' AND " + officeAlias + ".type>1)"); - } else if (SysRole.DATA_SCOPE_CREATOR.equals(dataScope)) { + } else if (SysRole.DATA_SCOPE_CREATOR.equals(dataScope)) {//操作员【非管理员用户数据】 // scopeSql.append(" OR " + configAlias + ".is_audit !=3"); scopeSql.append(" OR " + configAlias + ".creator_id <>1 "); - } else if (SysRole.DATA_SCOPE_AUDITOR.equals(dataScope)) { - scopeSql.append(" OR " + configAlias + ".is_audit = 0 or " + configAlias + ".is_audit = 1"); - scopeSql.append(" OR " + configAlias + ".creator_id <>1 "); - } else if (SysRole.DATA_SCOPE_SHOWER.equals(dataScope)) { + } else if (SysRole.DATA_SCOPE_AUDITOR.equals(dataScope)) {//审核员【未审核和审核通过状态的非管理员用户数据】 + scopeSql.append(" OR (" + configAlias + ".is_audit = 0 OR " + configAlias + ".is_audit = 1)"); + scopeSql.append(" AND " + configAlias + ".creator_id <>1 "); + } else if (SysRole.DATA_SCOPE_SHOWER.equals(dataScope)) {//审计员【审核通过状态的非管理员用户数据】 scopeSql.append(" OR " + configAlias + ".is_audit = 1"); - scopeSql.append(" OR " + configAlias + ".creator_id <>1 "); + scopeSql.append(" AND " + configAlias + ".creator_id <>1 "); } return scopeSql.toString(); @@ -2344,8 +2344,7 @@ public abstract class BaseService { try{ batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false); for(int index = 0; index < appPolicyCfgs.size();index++){ - AppPolicyCfg _cfg = new AppPolicyCfg(); - BeanUtils.copyProperties(appPolicyCfgs.get(index), _cfg); + AppPolicyCfg _cfg = appPolicyCfgs.get(index); ((AppCfgDao) batchSqlSession.getMapper(AppCfgDao.class)).insertAppPolicyCfgForBatch(_cfg); }