1.更新pcweb_menu_ermcp.json

2.fix bug: #2784 权限菜单问题

config/pcweb_menu/pcweb_menu_ermcp.json

@@ -635,14 +635,14 @@
                                 "remark": ""
                             },
                             {
-                                "label": "锁定",
+                                "label": "冻结",
                                 "rulekey": "client_pc_web_qiyefengguan_account_spot_locked",
                                 "code": "account_spot_locked",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "解锁",
+                                "label": "解冻",
                                 "rulekey": "client_pc_web_qiyefengguan_account_spot_unlocked",
                                 "code": "account_spot_unlocked",
                                 "isshow": true,
@@ -711,14 +711,14 @@
                                 "remark": ""
                             },
                             {
-                                "label": "锁定",
+                                "label": "冻结",
                                 "rulekey": "client_pc_web_qiyefengguan_account_trade_child_locked",
                                 "code": "account_trade_child_locked",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "解锁",
+                                "label": "解冻",
                                 "rulekey": "client_pc_web_qiyefengguan_account_trade_child_unlocked",
                                 "code": "account_trade_child_unlocked",
                                 "isshow": true,
@@ -787,14 +787,14 @@
                                 "remark": ""
                             },
                             {
-                                "label": "锁定",
+                                "label": "冻结",
                                 "rulekey": "client_pc_web_qiyefengguan_account_manager_child_locked",
                                 "code": "account_manager_child_locked",
                                 "isshow": true,
                                 "remark": ""
                             },
                             {
-                                "label": "解锁",
+                                "label": "解冻",
                                 "rulekey": "client_pc_web_qiyefengguan_account_manager_child_unlocked",
                                 "code": "account_manager_child_unlocked",
                                 "isshow": true,
@@ -1324,7 +1324,7 @@
                                 "label": "审核",
                                 "rulekey": "client_pc_web_qiyefengguan_plan_uncommitted_check",
                                 "code": "check",
-                                "isshow": true,
+                                "isshow": false,
                                 "remark": ""
                             },
                             {

models/ermcpAccMgr.go

@@ -614,26 +614,14 @@ func (r *ErmcpRoleMenu) buildSql() string {
 // GetDataEx 查询角色菜单
 func (r *ErmcpRoleMenu) GetDataEx() (interface{}, error) {
 	sDataEx := make([]ErmcpRoleMenuEx, 0)
-
-	// 获取所有菜单
-	sData := make([]ErmcpRoleMenu, 0)
-	sql := "select 0 userid," +
-		"       0 roleid," +
-		"       f.resourcecode," +
-		"       f.resourcename," +
-		"       f.resourcelevel," +
-		"       f.menutype," +
-		"       f.parentcode," +
-		"       f.url," +
-		"       f.sort," +
-		"       f.iconame," +
-		"       f.remark" +
-		" from funcmenulist f" +
-		" where f.resourcelevel <> 0"
 	if r.MENUTYPE == 0 {
 		r.MENUTYPE = 3
 	}
-	sql += fmt.Sprintf(" and f.menutype = %v", r.MENUTYPE)
+	// 获取所有菜单
+	sData := make([]ErmcpRoleMenu, 0)
+	// 获取所有菜单(指定用户id, 指定menutype, 角色为0的所有菜单)
+	mAll := ErmcpRoleMenu{USERID: r.USERID, MENUTYPE: r.MENUTYPE, FilterRoleId: "0"}
+	sql := mAll.buildSql()
 	_ = db.GetEngine().SQL(sql).Find(&sData)
 	// 先创建PARENTCODE为空的记录
 	for _, v := range sData {