Merge branch 'dev-sx' of http://129.211.46.84:8800/platform/hp-smart into dev

src/main/java/com/baosight/hpjx/core/dao/DaoUtils.java

@@ -65,9 +65,12 @@ public class DaoUtils {
 	 */
 	public static void batchInsert(String sql, List rows) {
 		// 创建人部门
-		List<String> orgIds = UserSessionUtils.getOrgId();
-		AssertUtils.isEmpty(orgIds, "当前用户未绑定部门，无法操作数据，请联系管理员！");
-		String depCode = orgIds.get(0);
+		String depCode = "";
+		if (!"admin".equals(UserSessionUtils.getLoginName())) {
+			List<String> orgIds = UserSessionUtils.getOrgId();
+			AssertUtils.isEmpty(orgIds, "当前用户未绑定部门，无法操作数据，请联系管理员！");
+			depCode = orgIds.get(0);
+		}
 		for (Object row : rows) {
 			if (row instanceof DaoEPBase) {
 				DaoEPBase daoEPBase = (DaoEPBase) row;
@@ -145,10 +148,14 @@ public class DaoUtils {
 			log.warn("写入创建人企业编码失败", e);
 		}
 		// 创建人组织机构
-		List<String> orgIds = UserSessionUtils.getOrgId();
-		AssertUtils.isEmpty(orgIds, "当前用户未绑定部门，无法操作数据，请联系管理员！");
+		String depCode = "";
+		if (!"admin".equals(userId)) {
+			List<String> orgIds = UserSessionUtils.getOrgId();
+			AssertUtils.isEmpty(orgIds, "当前用户未绑定部门，无法操作数据，请联系管理员！");
+			depCode = orgIds.get(0);
+		}
 		try {
-			BeanUtils.setProperty(bean, "depCode", orgIds.get(0));
+			BeanUtils.setProperty(bean, "depCode", depCode);
 		} catch (Exception e) {
 			log.warn("写入创建人部门编码失败", e);
 		}
@@ -199,11 +206,15 @@ public class DaoUtils {
 		} catch (Exception e) {
 			log.warn("写入创建人企业编码失败", e);
 		}
-		// 创建人部门编码
-		List<String> orgIds = UserSessionUtils.getOrgId();
-		AssertUtils.isEmpty(orgIds, "当前用户未绑定部门，无法操作数据，请联系管理员！");
+		// 创建人组织机构
+		String depCode = "";
+		if (!"admin".equals(userId)) {
+			List<String> orgIds = UserSessionUtils.getOrgId();
+			AssertUtils.isEmpty(orgIds, "当前用户未绑定部门，无法操作数据，请联系管理员！");
+			depCode = orgIds.get(0);
+		}
 		try {
-			map.put("depCode", orgIds.get(0));
+			map.put("depCode", depCode);
 		} catch (Exception e) {
 			log.warn("写入创建人企业编码失败", e);
 		}