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

src/main/java/com/baosight/hggp/hg/sc/service/ServiceHGSC101A.java

@@ -6,6 +6,8 @@ import com.baosight.hggp.hg.constant.HGConstant;
 import com.baosight.hggp.hg.sc.constant.HgScSqlConstant;
 import com.baosight.hggp.hg.sc.domain.HGSC001;
 import com.baosight.hggp.hg.sc.tools.HGSCTools;
+import com.baosight.hggp.hg.wd.constant.HgWdSqlConstant;
+import com.baosight.hggp.hg.wd.tools.HGWDTools;
 import com.baosight.hggp.util.AssertUtils;
 import com.baosight.hggp.util.CommonMethod;
 import com.baosight.hggp.util.EiInfoUtils;
@@ -100,6 +102,8 @@ public class ServiceHGSC101A extends ServiceEPBase {
 	private void modifyData(HGSC001 fSc001) {
 		Map map = fSc001.toMap();
 		DaoUtils.update(HgScSqlConstant.HgSc001.UPDATE_FOR_DC, map);
+		// 同步更新文档库
+		DaoUtils.update(HgWdSqlConstant.HgWd001.UPDATE_PROJECT, map);
 	}
 	
 	/**

src/main/java/com/baosight/hggp/hg/wd/constant/HgWdSqlConstant.java

@@ -20,6 +20,8 @@ public class HgWdSqlConstant {
 		public static final String COUNT_BY_TYPE = "HGWD001.countByType";
 		// 搜索树节点
 		public static final String SEARCH_TREE_NODE = "HGWD001.searchTreeNode";
+		// 修改项目
+		public static final String UPDATE_PROJECT = "HGWD001.updateProject";
 	}
 	
 	/**

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

@@ -360,4 +360,14 @@
         ORDER BY T3.FILE_ID ASC
     </select>
 
+    <!-- 修改项目信息 -->
+    <sql id="updateProject">
+        UPDATE ${hggpSchema}.HGWD001
+        SET
+        PROJ_NAME = #projName#,
+        PROJ_TYPE = #projType#,
+        <include refid="SqlBase.updateRevise"/>
+        WHERE PROJ_CODE = #projCode#
+    </sql>
+
 </sqlMap>

src/main/webapp/XS/XS40.js

@@ -259,7 +259,7 @@ $(function () {
                             EiCommunicator.send("XS03", "queryParentGroups", eiInfo, {
                                 onSuccess: function (ei) {
                                     var message = ei.getMsg();
-                                    IPLAT.confirm(message + "确认要删除[" + data.text + "]的信息吗？", function (e) {
+                                    IPLAT.confirm(message + "确认要从角色树中移除[" + data.text + "]吗？", function (e) {
                                         var eiInfo = new EiInfo();
                                         eiInfo.set("groupId", groupId);
                                         eiInfo.set("groupEname", groupEname);
@@ -673,4 +673,4 @@ window.onload = () => {
     }
 
     resetGridHeight()
-}
\ No newline at end of file
+}

src/main/webapp/XS/XS40.jsp

@@ -71,14 +71,16 @@
                     <li data-type="create">
                         <span style="font-size: 16px; width: 16px; vertical-align: middle;" class="fa fa-plus"></span>新增
                     </li>
+	                <li data-type="edit" id="isEdit">
+		                <span style="font-size: 16px; width: 16px; vertical-align: middle;" class="fa fa-pencil"></span>编辑
+	                </li>
                     <li data-type="delete" id="isDel">
                         <span style="font-size: 16px; width: 16px; vertical-align: middle;"
-                              class="fa fa-minus-circle"></span>删除
-                    </li>
-                    <li data-type="edit" id="isEdit">
-                        <span style="font-size: 16px; width: 16px; vertical-align: middle;" class="fa fa-pencil"></span>编辑
+                              class="fa fa-minus-circle"></span>移除
                     </li>
                 </ul>
+	            <br/>
+	            <span style="color: red; ">说明："删除角色"需要到用户信息管理->角色管理界面进行操作</span><br>
             </EF:EFRegion>
         </div>
         <div id="right-pane" class="i-fit-height">