Merge branch 'dev-sx' of http://git.pseer.com:8800/platform/hg-smart into dev

src/main/java/com/baosight/hggp/hg/wd/tools/HGWDTools.java

@@ -234,6 +234,7 @@ public class HGWDTools {
 			AssertUtils.isNull(extId, "实体ID不能为空！");
 			Map queryMap = new HashMap();
 			queryMap.put(HGWD005.FIELD_EXT_ID, extId);
+			queryMap.put("notAuth", true);
 			List<HGWD005> results = DaoBase.getInstance().query(HGWD005.QUERY, queryMap);
 			return CollectionUtils.isEmpty(results) ? null : results.get(0);
 		}

src/main/java/com/baosight/iplat4j/core/data/ibatis/dao/SqlMapDaoLogProxy.java

@@ -7,6 +7,7 @@ import com.baosight.hggp.core.tools.ThreadLocalTools;
 import com.baosight.hggp.hg.xs.domain.UserGroup;
 import com.baosight.hggp.hg.xs.tools.HGXSTools;
 import com.baosight.hggp.util.AssertUtils;
+import com.baosight.hggp.util.MapUtils;
 import com.baosight.hggp.util.StringUtils;
 import com.baosight.iplat4j.core.ioc.spring.PlatApplicationContext;
 import com.baosight.iplat4j.core.service.soa.DomainQuery.PageStatus;
@@ -208,6 +209,11 @@ public class SqlMapDaoLogProxy extends SqlMapDao {
 	 * @param parameters
 	 */
 	private void setDataAuth(String name, Object parameters) {
+		// 本次操作不做权限
+		boolean notAuth = MapUtils.getBooleanValue((Map) parameters, "notAuth");
+		if (notAuth) {
+			return;
+		}
 		// 需要过滤部分sql name，否则会形成死循环；admin账户不需要校验
 		String loginName = UserSessionUtils.getLoginName();
 		String[] serviceFilter = {"HGXSUser", "HGXSOrg", "HGXSUserGroup", "HGPZ009.query", "HGPZ010.query"};