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

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

@@ -168,6 +168,9 @@ public class DaoUtils {
 			} catch (Exception e) {
 				userName = "System";
 			}
+			if (StringUtils.isBlank(userName)) {
+				userName = "System";
+			}
 			BeanUtils.setProperty(bean, "createdName", userName);
 			BeanUtils.setProperty(bean, "updatedName", userName);
 		} catch (Exception e) {
@@ -290,6 +293,9 @@ public class DaoUtils {
 		// 修改人名称
 		try {
 			String userName = UserSession.getLoginCName();
+			if (StringUtils.isBlank(userName)) {
+				userName = "System";
+			}
 			BeanUtils.setProperty(bean, "updatedName", userName);
 		} catch (Exception e) {
 			log.warn("写入修改人名称失败", e);

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD005.java

@@ -2,6 +2,7 @@ package com.baosight.hggp.hg.wd.service;
 
 import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
 import com.baosight.hggp.core.dao.DaoUtils;
+import com.baosight.hggp.core.enums.DeleteFlagEnum;
 import com.baosight.hggp.core.extapp.decheng.api.DcOpenApi;
 import com.baosight.hggp.core.extapp.decheng.model.DcContractList;
 import com.baosight.hggp.core.extapp.decheng.model.DcProductList;
@@ -141,6 +142,7 @@ public class ServiceHGWD005 extends ServiceEPBase {
 				dbWd005.setProductModel(dcProductList.getCpxh());
 				dbWd005.setUnit(dcProductList.getUnit());
 				dbWd005.setClassify(dcProductList.getFenlei());
+				dbWd005.setDeleteFlag(DeleteFlagEnum.UN_REMOVE.getCode());
 				DaoUtils.insert(HGWD005.INSERT, dbWd005);
 			} else {
 				Map updateMap = new HashMap();

src/main/java/com/baosight/hggp/hg/wd/sql/HGWD005.xml

@@ -26,12 +26,6 @@
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="accountCode">
-			ACCOUNT_CODE = #accountCode#
-		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="depCode">
-			DEP_CODE = #depCode#
-		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="deleteFlag">
 			DELETE_FLAG = #deleteFlag#
 		</isNotEmpty>
@@ -69,7 +63,7 @@
         </dynamic>
     </sql>
 
-    <select id="query" resultClass="com.baosight.ctdy.Hgwd005">
+    <select id="query" resultClass="com.baosight.hggp.hg.wd.domain.HGWD005">
         SELECT
         <include refid="column"/>
         FROM ${hggpSchema}.HGWD005

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

@@ -231,9 +231,10 @@ public class HGWDTools {
 		 * @return
 		 */
 		public static HGWD005 get(String extId) {
-			AssertUtils.isNull(extId, "项目Code不能为空！");
+			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"};

src/main/webapp/HG/WD/HGWD003.js

@@ -255,11 +255,17 @@ let showAuthButton = function () {
 	inInfo.set("inqu_status-0-fileId", label);
 	EiCommunicator.send('HGWD003', 'isProjectManager', inInfo, {
 		onSuccess: function (res) {
-			if (res.getStatus() >= 0 && res.extAttr.isProjectManager == 1) {
+			let status = res.getStatus();
+			if (status >= 0 && res.extAttr.isManager == 1) {
 				$("#AUTH").show();
 				$("#REMOVE_USER").show();
 				$("#COPY_USER").show();
 				$("#SAVE").show();
+			} else if (status >= 0 && res.extAttr.isProjectManager == 1) {
+				$("#AUTH").show();
+				$("#REMOVE_USER").show();
+				$("#COPY_USER").hide();
+				$("#SAVE").hide();
 			} else {
 				$("#AUTH").hide();
 				$("#REMOVE_USER").hide();