1

2026-06-18 17:53:54 +08:00
parent 47e971ebc8
commit 702615c59f
3 changed files with 60 additions and 12 deletions
@@ -77,7 +77,7 @@ public class TourBranchUserAssignmentController {
     * 分页查询候选人员，候选范围由疗休养配置可参加人员范围和当前登录人所在分工会共同决定；userIds 仅作为人员选择器筛选条件。
     */
    @At
-    @SaCheckPermission("tour.branchUserAssignment")
+    @SaCheckPermission("tour.branchUserAssignment.assign")
    public Result candidatePageData(PageForm pageForm, String settingId, String keyword, @Param("userIds") String userIds) {
        return Result.success(tourUserAssignmentService.branchCandidatePage(pageForm, settingId, keyword, parseUserIds(userIds)));
    }
@@ -104,7 +104,7 @@ public class TourBranchUserAssignmentController {
     * 查询当前登录人所在分工会在指定配置下的名额使用情况。
     */
    @At
-    @SaCheckPermission("tour.branchUserAssignment")
+    @SaCheckPermission("tour.branchUserAssignment.assign")
    public Result quotaInfo(String settingId) {
        return Result.success(tourUserAssignmentService.branchQuotaInfo(settingId));
    }
@@ -114,7 +114,7 @@ public class TourBranchUserAssignmentController {
     */
    @At
    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("tour.branchUserAssignment")
+    @SaCheckPermission("tour.branchUserAssignment.assign")
    @SLog(type = "tour", tag = "疗休养分工会人员分配", msg = "保存分工会人员分配")
    public Result doAssign(String settingId, String matterId, String personType, @Param("userIds") String userIds) {
        List<String> parsedUserIds;
@@ -135,7 +135,7 @@ public class TourBranchUserAssignmentController {
     */
    @At
    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("tour.branchUserAssignment")
+    @SaCheckPermission("tour.branchUserAssignment.switchPersonType")
    @SLog(type = "tour", tag = "疗休养分工会人员分配", msg = "切换分工会人员类型")
    public Result switchPersonType(String id, String personType) {
        try {
@@ -150,7 +150,7 @@ public class TourBranchUserAssignmentController {
     */
    @At
    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("tour.branchUserAssignment")
+    @SaCheckPermission("tour.branchUserAssignment.selectMatter")
    @SLog(type = "tour", tag = "疗休养分工会人员分配", msg = "选择分工会分配事项")
    public Result selectMatter(String id, String matterId) {
        try {
@@ -180,7 +180,7 @@ public class TourBranchUserAssignmentController {
     * 删除前检查该分配记录是否已经存在对应报名台账。
     */
    @At
-    @SaCheckPermission("tour.branchUserAssignment")
+    @SaCheckPermission("tour.branchUserAssignment.delete")
    public Result deleteInfo(String id) {
        if (StrUtil.isBlank(id)) {
            return Result.error("参数错误");
@@ -193,7 +193,7 @@ public class TourBranchUserAssignmentController {
     */
    @At
    @Aop(TransAop.READ_COMMITTED)
-    @SaCheckPermission("tour.branchUserAssignment")
+    @SaCheckPermission("tour.branchUserAssignment.delete")
    @SLog(type = "tour", tag = "疗休养分工会人员分配", msg = "删除分工会人员分配")
    public Result doDelete(String id, Boolean deleteLedger) {
        if (StrUtil.isBlank(id)) {
@@ -99,6 +99,48 @@ FROM sys_menu p
 WHERE p.permission = 'tour'
  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.group') t);

+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10013', p.id, CONCAT(p.path, '0012'), '分工会人员分配', 'Branch User Assignment', 'menu', '/platform/tour/branchUserAssignment', 'data-pjax', '', 1, 0, 'tour.branchUserAssignment', NULL, 12, 1, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'f', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.branchUserAssignment') t);
+
+-- 分工会人员分配按钮级权限，页面按钮展示和后端接口权限保持一致。
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10101', p.id, CONCAT(p.path, '0001'), '人员分配', 'Assign', 'data', '', '', '', 0, 0, 'tour.branchUserAssignment.assign', NULL, 1, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'r', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour.branchUserAssignment'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.branchUserAssignment.assign') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10102', p.id, CONCAT(p.path, '0002'), '选择路线', 'Select Matter', 'data', '', '', '', 0, 0, 'tour.branchUserAssignment.selectMatter', NULL, 2, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'x', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour.branchUserAssignment'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.branchUserAssignment.selectMatter') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10103', p.id, CONCAT(p.path, '0003'), '切换人员类型', 'Switch Person Type', 'data', '', '', '', 0, 0, 'tour.branchUserAssignment.switchPersonType', NULL, 3, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'q', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour.branchUserAssignment'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.branchUserAssignment.switchPersonType') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10104', p.id, CONCAT(p.path, '0004'), '取消退出', 'Cancel Restore', 'data', '', '', '', 0, 0, 'tour.branchUserAssignment.cancelRestore', NULL, 4, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 'q', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour.branchUserAssignment'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.branchUserAssignment.cancelRestore') t);
+
+INSERT INTO sys_menu (id, parentId, path, name, aliasName, type, href, target, icon, showit, disabled, permission, note, location, hasChildren, createdBy, createdAt, updatedBy, updatedAt, delFlag, platform, moduleId, picIcon, initialPinyinName, isRecommendApp, isRecommendService)
+SELECT 'b7c63f0c73a44a9a8c4f3d3bb1a10105', p.id, CONCAT(p.path, '0005'), '删除', 'Delete', 'data', '', '', '', 0, 0, 'tour.branchUserAssignment.delete', NULL, 5, 0, '', UNIX_TIMESTAMP(NOW()) * 1000, '', UNIX_TIMESTAMP(NOW()) * 1000, 0, 'PC', NULL, NULL, 's', 0, 0
+FROM sys_menu p
+WHERE p.permission = 'tour.branchUserAssignment'
+  AND NOT EXISTS (SELECT 1 FROM (SELECT id FROM sys_menu WHERE permission = 'tour.branchUserAssignment.delete') t);
+
+UPDATE sys_menu p
+JOIN (SELECT DISTINCT parentId FROM sys_menu WHERE type = 'data' AND delFlag = 0) c ON c.parentId = p.id
+SET p.hasChildren = 1
+WHERE p.permission = 'tour.branchUserAssignment';
+
 -- 给系统管理员默认授权，其他角色可在角色管理中按需分配。
 INSERT INTO sys_role_menu (roleId, menuId)
 SELECT r.id, m.id
@@ -115,7 +157,13 @@ JOIN sys_menu m ON m.permission IN (
    'tour.unionledger',
    'tour.unionApproval',
    'tour.schoolUnionApproval',
-    'tour.ledger'
+    'tour.ledger',
+    'tour.branchUserAssignment',
+    'tour.branchUserAssignment.assign',
+    'tour.branchUserAssignment.selectMatter',
+    'tour.branchUserAssignment.switchPersonType',
+    'tour.branchUserAssignment.cancelRestore',
+    'tour.branchUserAssignment.delete'
 )
 LEFT JOIN sys_role_menu rm ON rm.roleId = r.id AND rm.menuId = m.id
 WHERE r.code = 'SYSADMIN'
@@ -50,7 +50,7 @@ layout("/layouts/platform.html"){

        <el-card class="mt10" shadow="never">
            <table-tool :app="this" label="分工会人员分配列表">
-                <el-button type="primary" size="medium" @click="openAssign">
+                <el-button v-if="$auth.hasPermission('tour.branchUserAssignment.assign')" type="primary" size="medium" @click="openAssign">
                    <i class="el-icon-user"></i>
                    人员分配
                </el-button>
@@ -83,10 +83,10 @@ layout("/layouts/platform.html"){
                <el-table-column label="分配时间" prop="assignedAt" width="170" sortable="custom" align="center" header-align="center" show-overflow-tooltip></el-table-column>
                <el-table-column label="操作" width="380" align="center" header-align="center" fixed="right">
                    <template slot-scope="{row}">
-                        <el-button v-if="!row.matterId && row.personType !== 'BACKUP'" size="mini" type="primary" @click="openSelectMatter(row)">选择路线</el-button>
-                        <el-button size="mini" type="primary" :loading="personTypeSwitching === row.id" @click="switchPersonType(row, row.personType === 'BACKUP' ? 'FORMAL' : 'BACKUP')">{{ row.personType === 'BACKUP' ? '转为正式' : '转为替补' }}</el-button>
+                        <el-button v-if="!row.matterId && row.personType !== 'BACKUP' && $auth.hasPermission('tour.branchUserAssignment.selectMatter')" size="mini" type="primary" @click="openSelectMatter(row)">选择路线</el-button>
+                        <el-button v-if="$auth.hasPermission('tour.branchUserAssignment.switchPersonType')" size="mini" type="primary" :loading="personTypeSwitching === row.id" @click="switchPersonType(row, row.personType === 'BACKUP' ? 'FORMAL' : 'BACKUP')">{{ row.personType === 'BACKUP' ? '转为正式' : '转为替补' }}</el-button>
                        <el-button v-if="isCancelled(row) && $auth.hasPermission('tour.branchUserAssignment.cancelRestore')" size="mini" type="warning" @click="restoreCancel(row)">取消退出</el-button>
-                        <el-button size="mini" type="danger" @click="doDelete(row)">删除</el-button>
+                        <el-button v-if="$auth.hasPermission('tour.branchUserAssignment.delete')" size="mini" type="danger" @click="doDelete(row)">删除</el-button>
                    </template>
                </el-table-column>
            </el-table>