1、权限细分细节调整

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/controller/WorkorderPermissionUserController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.workorderPermissionUser.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.workorderPermissionUser.entity.WorkorderPermissionUser;
+import org.jeecg.modules.workorderPermissionUser.service.IWorkorderPermissionUserService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 用户信息权限配置表
+ * @Author: jeecg-boot
+ * @Date:   2025-01-03
+ * @Version: V1.0
+ */
+@Api(tags="用户信息权限配置表")
+@RestController
+@RequestMapping("/workorderPermissionUser/workorderPermissionUser")
+@Slf4j
+public class WorkorderPermissionUserController extends JeecgController<WorkorderPermissionUser, IWorkorderPermissionUserService> {
+	@Autowired
+	private IWorkorderPermissionUserService workorderPermissionUserService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param workorderPermissionUser
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "用户信息权限配置表-分页列表查询")
+	@ApiOperation(value="用户信息权限配置表-分页列表查询", notes="用户信息权限配置表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<WorkorderPermissionUser>> queryPageList(WorkorderPermissionUser workorderPermissionUser,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<WorkorderPermissionUser> queryWrapper = QueryGenerator.initQueryWrapper(workorderPermissionUser, req.getParameterMap());
+		Page<WorkorderPermissionUser> page = new Page<WorkorderPermissionUser>(pageNo, pageSize);
+		IPage<WorkorderPermissionUser> pageList = workorderPermissionUserService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param workorderPermissionUser
+	 * @return
+	 */
+	@AutoLog(value = "用户信息权限配置表-添加")
+	@ApiOperation(value="用户信息权限配置表-添加", notes="用户信息权限配置表-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody WorkorderPermissionUser workorderPermissionUser) {
+		workorderPermissionUserService.save(workorderPermissionUser);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param workorderPermissionUser
+	 * @return
+	 */
+	@AutoLog(value = "用户信息权限配置表-编辑")
+	@ApiOperation(value="用户信息权限配置表-编辑", notes="用户信息权限配置表-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody WorkorderPermissionUser workorderPermissionUser) {
+		workorderPermissionUserService.updateById(workorderPermissionUser);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "用户信息权限配置表-通过id删除")
+	@ApiOperation(value="用户信息权限配置表-通过id删除", notes="用户信息权限配置表-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		workorderPermissionUserService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "用户信息权限配置表-批量删除")
+	@ApiOperation(value="用户信息权限配置表-批量删除", notes="用户信息权限配置表-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.workorderPermissionUserService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "用户信息权限配置表-通过id查询")
+	@ApiOperation(value="用户信息权限配置表-通过id查询", notes="用户信息权限配置表-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<WorkorderPermissionUser> queryById(@RequestParam(name="id",required=true) String id) {
+		WorkorderPermissionUser workorderPermissionUser = workorderPermissionUserService.getById(id);
+		if(workorderPermissionUser==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(workorderPermissionUser);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param workorderPermissionUser
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, WorkorderPermissionUser workorderPermissionUser) {
+        return super.exportXls(request, workorderPermissionUser, WorkorderPermissionUser.class, "用户信息权限配置表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, WorkorderPermissionUser.class);
+    }
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/entity/WorkorderPermissionUser.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.workorderPermissionUser.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 用户信息权限配置表
+ * @Author: jeecg-boot
+ * @Date:   2025-01-03
+ * @Version: V1.0
+ */
+@Data
+@TableName("workorder_permission_user")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="workorder_permission_user对象", description="用户信息权限配置表")
+public class WorkorderPermissionUser implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**关联角色id*/
+	@Excel(name = "关联角色id", width = 15, dictTable = "workorder_role", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "workorder_role", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "关联角色id")
+    private java.lang.String roleId;
+	/**是否可修改用户信息*/
+	@Excel(name = "是否可修改用户信息", width = 15, dicCode = "is_edit")
+	@Dict(dicCode = "is_edit")
+    @ApiModelProperty(value = "是否可修改用户信息")
+    private java.lang.String isEdit;
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/mapper/WorkorderPermissionUserMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.workorderPermissionUser.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.workorderPermissionUser.entity.WorkorderPermissionUser;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 用户信息权限配置表
+ * @Author: jeecg-boot
+ * @Date:   2025-01-03
+ * @Version: V1.0
+ */
+public interface WorkorderPermissionUserMapper extends BaseMapper<WorkorderPermissionUser> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/mapper/xml/WorkorderPermissionUserMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.workorderPermissionUser.mapper.WorkorderPermissionUserMapper">
+
+</mapper>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/service/IWorkorderPermissionUserService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.workorderPermissionUser.service;
+
+import org.jeecg.modules.workorderPermissionUser.entity.WorkorderPermissionUser;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 用户信息权限配置表
+ * @Author: jeecg-boot
+ * @Date:   2025-01-03
+ * @Version: V1.0
+ */
+public interface IWorkorderPermissionUserService extends IService<WorkorderPermissionUser> {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/service/impl/WorkorderPermissionUserServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.workorderPermissionUser.service.impl;
+
+import org.jeecg.modules.workorderPermissionUser.entity.WorkorderPermissionUser;
+import org.jeecg.modules.workorderPermissionUser.mapper.WorkorderPermissionUserMapper;
+import org.jeecg.modules.workorderPermissionUser.service.IWorkorderPermissionUserService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 用户信息权限配置表
+ * @Author: jeecg-boot
+ * @Date:   2025-01-03
+ * @Version: V1.0
+ */
+@Service
+public class WorkorderPermissionUserServiceImpl extends ServiceImpl<WorkorderPermissionUserMapper, WorkorderPermissionUser> implements IWorkorderPermissionUserService {
+
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/vue/WorkorderPermissionUserList.vue

@@ -0,0 +1,198 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="关联角色id">
+              <j-dict-select-tag placeholder="请选择关联角色id" v-model="queryParam.roleId" dictCode="workorder_role,name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="是否可修改用户信息">
+              <j-dict-select-tag placeholder="请选择是否可修改用户信息" v-model="queryParam.isEdit" dictCode="is_edit"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('用户信息权限配置表')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <workorder-permission-user-modal ref="modalForm" @ok="modalFormOk"></workorder-permission-user-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import WorkorderPermissionUserModal from './modules/WorkorderPermissionUserModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'WorkorderPermissionUserList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      WorkorderPermissionUserModal
+    },
+    data () {
+      return {
+        description: '用户信息权限配置表管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'关联角色id',
+            align:"center",
+            dataIndex: 'roleId_dictText'
+          },
+          {
+            title:'是否可修改用户信息',
+            align:"center",
+            dataIndex: 'isEdit_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/workorderPermissionUser/workorderPermissionUser/list",
+          delete: "/workorderPermissionUser/workorderPermissionUser/delete",
+          deleteBatch: "/workorderPermissionUser/workorderPermissionUser/deleteBatch",
+          exportXlsUrl: "/workorderPermissionUser/workorderPermissionUser/exportXls",
+          importExcelUrl: "workorderPermissionUser/workorderPermissionUser/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'roleId',text:'关联角色id',dictCode:"workorder_role,name,id"})
+        fieldList.push({type:'string',value:'isEdit',text:'是否可修改用户信息',dictCode:'is_edit'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/vue/modules/WorkorderPermissionUserForm.vue

@@ -0,0 +1,109 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="关联角色id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="roleId">
+              <j-dict-select-tag type="list" v-model="model.roleId" dictCode="workorder_role,name,id" placeholder="请选择关联角色id" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="是否可修改用户信息" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isEdit">
+              <j-dict-select-tag type="list" v-model="model.isEdit" dictCode="is_edit" placeholder="请选择是否可修改用户信息" />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'WorkorderPermissionUserForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/workorderPermissionUser/workorderPermissionUser/add",
+          edit: "/workorderPermissionUser/workorderPermissionUser/edit",
+          queryById: "/workorderPermissionUser/workorderPermissionUser/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/vue/modules/WorkorderPermissionUserModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <workorder-permission-user-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></workorder-permission-user-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import WorkorderPermissionUserForm from './WorkorderPermissionUserForm'
+
+  export default {
+    name: 'WorkorderPermissionUserModal',
+    components: {
+      WorkorderPermissionUserForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/vue/modules/WorkorderPermissionUserModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <workorder-permission-user-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></workorder-permission-user-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import WorkorderPermissionUserForm from './WorkorderPermissionUserForm'
+  export default {
+    name: 'WorkorderPermissionUserModal',
+    components: {
+      WorkorderPermissionUserForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/vue3/WorkorderPermissionUser.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/workorderPermissionUser/workorderPermissionUser/list',
+  save='/workorderPermissionUser/workorderPermissionUser/add',
+  edit='/workorderPermissionUser/workorderPermissionUser/edit',
+  deleteOne = '/workorderPermissionUser/workorderPermissionUser/delete',
+  deleteBatch = '/workorderPermissionUser/workorderPermissionUser/deleteBatch',
+  importExcel = '/workorderPermissionUser/workorderPermissionUser/importExcel',
+  exportXls = '/workorderPermissionUser/workorderPermissionUser/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/vue3/WorkorderPermissionUser.data.ts

@@ -0,0 +1,57 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '关联角色id',
+    align:"center",
+    dataIndex: 'roleId_dictText'
+   },
+   {
+    title: '是否可修改用户信息',
+    align:"center",
+    dataIndex: 'isEdit_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "关联角色id",
+      field: "roleId",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"workorder_role,name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "是否可修改用户信息",
+      field: "isEdit",
+      component: 'JDictSelectTag',
+      componentProps:{
+          dictCode:"is_edit"
+      },
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '关联角色id',
+    field: 'roleId',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"workorder_role,name,id"
+     },
+  },
+  {
+    label: '是否可修改用户信息',
+    field: 'isEdit',
+    component: 'JDictSelectTag',
+    componentProps:{
+        dictCode:"is_edit"
+     },
+  },
+];

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/vue3/WorkorderPermissionUserList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <WorkorderPermissionUserModal @register="registerModal" @success="handleSuccess"></WorkorderPermissionUserModal>
+  </div>
+</template>
+
+<script lang="ts" name="workorderPermissionUser-workorderPermissionUser" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import WorkorderPermissionUserModal from './components/WorkorderPermissionUserModal.vue'
+  import {columns, searchFormSchema} from './workorderPermissionUser.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './workorderPermissionUser.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '用户信息权限配置表',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"用户信息权限配置表",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/workorderPermissionUser/vue3/components/WorkorderPermissionUserModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../workorderPermissionUser.data';
+    import {saveOrUpdate} from '../workorderPermissionUser.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/ConfigController.java

@@ -48,7 +48,7 @@ public class ConfigController {
         return configService.templateStatusInfo(pageBean);
     }
 
-    @ApiOperation(value="配置信息-查询工序信息配置", notes="配置信息-查询工序信息配置")
+    @ApiOperation(value="配置信息-查询工序卡信息配置", notes="配置信息-查询工序卡信息配置")
     @RequestMapping(value = "/stepInfo", method = {RequestMethod.GET})
     public Result<?> stepInfo(PageBean pageBean){
         return configService.stepInfo(pageBean);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/TemplateController.java

@@ -40,19 +40,19 @@ public class TemplateController {
     /**************************************工单**********************************************************/
     @ApiOperation(value="工单信息-查询工单列表", notes="工单信息-查询工单列表")
     @RequestMapping(value = "/queryTemplateList", method = {RequestMethod.GET})
-    public Result<?> queryTemplateList(@RequestHeader("X-Access-Token") String userId, QueryTemplateBean templateBean, PageBean pageBean){
-        return templateService.queryTemplateList(userId, templateBean, pageBean);
+    public Result<?> queryTemplateList(@RequestHeader("X-Access-Token") String token, QueryTemplateBean templateBean, PageBean pageBean){
+        return templateService.queryTemplateList(token, templateBean, pageBean);
     }
 
     @ApiOperation(value="工单信息-根据id查询工单详情", notes="工单信息-根据id查询工单详情")
     @RequestMapping(value = "/queryTemplateById", method = {RequestMethod.GET})
-    public Result<?> queryTemplateById(@RequestHeader("X-Access-Token") String userId, String templateId){
-        return templateService.queryTemplateById(userId, templateId);
+    public Result<?> queryTemplateById(@RequestHeader("X-Access-Token") String token, String templateId){
+        return templateService.queryTemplateById(token, templateId);
     }
 
     @ApiOperation(value="工单信息-修改工单", notes="工单信息-修改工单")
     @RequestMapping(value = "/updateTemplate", method = {RequestMethod.POST})
-    public Result<?> updateTemplate(UpdateTemplateBean templateBean, String roleId){
+    public Result<?> updateTemplate(UpdateTemplateBean templateBean, @RequestHeader("X-Access-Token") String token){
 
         //返回信息
         String message = "";
@@ -72,7 +72,7 @@ public class TemplateController {
         }else if(StringUtils.isEmpty(templateBean.getStatusId())){
             message = "状态id未填写，请填写状态id";
         }else {
-            return templateService.updateTemplate(workorderTemplate, roleId);
+            return templateService.updateTemplate(workorderTemplate, token);
         }
 
         return Result.error(message);
@@ -113,50 +113,50 @@ public class TemplateController {
 
     @ApiOperation(value="工单信息-修改常规参数-工序卡1(选配)", notes="工单信息-修改常规参数-修改工序卡1(选配)")
     @RequestMapping(value = "/updateGeneralStepOne", method = {RequestMethod.POST})
-    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String roleId){
-        return templateService.updateGeneralStepOne(generalStepone, roleId);
+    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, @RequestHeader("X-Access-Token") String token){
+        return templateService.updateGeneralStepOne(generalStepone, token);
     }
 
     @ApiOperation(value="工单信息-修改常规参数-工序卡2", notes="工单信息-修改常规参数-修改工序卡2")
     @RequestMapping(value = "/updateGeneralStepTwo", method = {RequestMethod.POST})
-    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String roleId){
-        return templateService.updateGeneralStepTwo(generalSteptwo, roleId);
+    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, @RequestHeader("X-Access-Token") String token){
+        return templateService.updateGeneralStepTwo(generalSteptwo, token);
     }
 
     @ApiOperation(value="工单信息-修改常规参数-工序卡3", notes="工单信息-修改常规参数-修改工序卡3")
     @RequestMapping(value = "/updateGeneralStepThree", method = {RequestMethod.POST})
-    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String roleId){
-        return templateService.updateGeneralStepThree(generalStepthree, roleId);
+    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, @RequestHeader("X-Access-Token") String token){
+        return templateService.updateGeneralStepThree(generalStepthree, token);
     }
 
     @ApiOperation(value="工单信息-修改常规参数-工序卡4(总成)", notes="工单信息-修改常规参数-修改工序卡4(总成)")
     @RequestMapping(value = "/updateGeneralStepFour", method = {RequestMethod.POST})
-    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String roleId){
-        return templateService.updateGeneralStepFour(generalStepfour, roleId);
+    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, @RequestHeader("X-Access-Token") String token){
+        return templateService.updateGeneralStepFour(generalStepfour, token);
     }
 
     @ApiOperation(value="工单信息-修改工序参数-工序卡1(选配)", notes="工单信息-修改常规参数-修改工序卡1(选配)")
     @RequestMapping(value = "/updateParamStepOne", method = {RequestMethod.POST})
-    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, String roleId){
-        return templateService.updateParamStepOne(paramStepone, roleId);
+    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, @RequestHeader("X-Access-Token") String token){
+        return templateService.updateParamStepOne(paramStepone, token);
     }
 
     @ApiOperation(value="工单信息-修改工序参数-工序卡2", notes="工单信息-修改常规参数-修改工序卡2")
     @RequestMapping(value = "/updateParamStepTwo", method = {RequestMethod.POST})
-    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String roleId){
-        return templateService.updateParamStepTwo(paramSteptwo, roleId);
+    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, @RequestHeader("X-Access-Token") String token){
+        return templateService.updateParamStepTwo(paramSteptwo, token);
     }
 
     @ApiOperation(value="工单信息-修改工序参数-工序卡3", notes="工单信息-修改常规参数-修改工序卡3")
     @RequestMapping(value = "/updateParamStepThree", method = {RequestMethod.POST})
-    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, String roleId){
-        return templateService.updateParamStepThree(paramStepthree, roleId);
+    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, @RequestHeader("X-Access-Token") String token){
+        return templateService.updateParamStepThree(paramStepthree, token);
     }
 
     @ApiOperation(value="工单信息-修改工序参数-工序卡4(总成)", notes="工单信息-修改常规参数-修改工序卡4(总成)")
     @RequestMapping(value = "/updateParamStepFour", method = {RequestMethod.POST})
-    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, String roleId){
-        return templateService.updateParamStepFour(paramStepfour, roleId);
+    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, @RequestHeader("X-Access-Token") String token){
+        return templateService.updateParamStepFour(paramStepfour, token);
     }
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/workorderController/UserController.java

@@ -9,6 +9,7 @@ import org.jeecg.modules.apiBean.PageBean;
 import org.jeecg.modules.apiBean.UserBean;
 import org.jeecg.modules.apiService.UserService;
 import org.jeecg.modules.workorderUser.entity.WorkorderUser;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,7 +36,7 @@ public class UserController {
 
     @ApiOperation(value="用户信息-根据id查询用户信息", notes="用户信息-根据id查询用户信息")
     @RequestMapping(value = "/queryUserById", method = {RequestMethod.GET})
-    public Result<?> queryUserById(String userId){
+    public Result<?> queryUserById(@RequestHeader("X-Access-Token") String token, String userId){
 
         String message = "";
         //注册信息验证
@@ -43,7 +44,7 @@ public class UserController {
             message = "用户id未填写，请填写用户id!";
         }else {
             //注册信息无误，进入业务流程处理
-            return userService.queryUserById(userId);
+            return userService.queryUserById(token, userId);
         }
 
         //注册信息有误，返回错误信息
@@ -100,7 +101,7 @@ public class UserController {
 
     @ApiOperation(value="用户信息-资料修改", notes="用户信息-资料修改")
     @RequestMapping(value = "/updateUser", method = {RequestMethod.POST})
-    public Result<?> updateUser(UserBean userBean){
+    public Result<?> updateUser(@RequestHeader("X-Access-Token") String token, UserBean userBean){
 
         //将注册信息注入到实体bean中
         WorkorderUser workorderUser = new WorkorderUser();
@@ -125,7 +126,7 @@ public class UserController {
             message = "用户角色id未填写，请填写用户角色id!";
         }else {
             //注册信息无误，进入业务流程处理
-            return userService.updateUser(workorderUser);
+            return userService.updateUser(token, workorderUser);
         }
 
         //注册信息有误，返回错误信息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/TemplateService.java

@@ -31,14 +31,14 @@ public interface TemplateService {
      * @param templateId
      * @return
      */
-    public Result<?> queryTemplateById(String userId, String templateId);
+    public Result<?> queryTemplateById(String token, String templateId);
 
     /**
      * 工单信息-修改工单
      * @param workorderTemplate
      * @return
      */
-    public Result<?> updateTemplate(WorkorderTemplate workorderTemplate, String roleId);
+    public Result<?> updateTemplate(WorkorderTemplate workorderTemplate, String token);
 
     /**
      * 工单信息-删除工单
@@ -80,55 +80,55 @@ public interface TemplateService {
      * @param generalStepone
      * @return
      */
-    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String roleId);
+    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String token);
 
     /**
      * 工单信息-修改常规参数-工序卡2
      * @param generalSteptwo
      * @return
      */
-    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String roleId);
+    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String token);
 
     /**
      * 工单信息-修改常规参数-工序卡3
      * @param generalStepthree
      * @return
      */
-    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String roleId);
+    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String token);
 
     /**
      * 工单信息-修改常规参数-工序卡4
      * @param generalStepfour
      * @return
      */
-    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String roleId);
+    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String token);
 
     /**
      * 工单信息-修改工序参数-工序卡1
      * @param paramStepone
      * @return
      */
-    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, String roleId);
+    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, String token);
 
     /**
      * 工单信息-修改工序参数-工序卡2
      * @param paramSteptwo
      * @return
      */
-    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String roleId);
+    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String token);
 
     /**
      * 工单信息-修改工序参数-工序卡3
      * @param paramStepthree
      * @return
      */
-    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, String roleId);
+    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, String token);
 
     /**
      * 工单信息-修改工序参数-工序卡4
      * @param paramStepfour
      * @return
      */
-    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, String roleId);
+    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, String token);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/UserService.java

@@ -14,10 +14,11 @@ public interface UserService {
 
     /**
      * 用户信息-根据id查询用户信息
+     * @param token
      * @param userId
      * @return
      */
-    public Result<?> queryUserById(String userId);
+    public Result<?> queryUserById(String token, String userId);
 
     /**
      * 登录
@@ -39,6 +40,6 @@ public interface UserService {
      * @param workorderUser 用户信息
      * @return
      */
-    public Result<?> updateUser(WorkorderUser workorderUser);
+    public Result<?> updateUser(String token, WorkorderUser workorderUser);
 
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/TemplateServiceImpl.java

@@ -39,6 +39,8 @@ import org.jeecg.modules.workorderStep.entity.WorkorderStep;
 import org.jeecg.modules.workorderStep.service.IWorkorderStepService;
 import org.jeecg.modules.workorderTemplate.entity.WorkorderTemplate;
 import org.jeecg.modules.workorderTemplate.service.IWorkorderTemplateService;
+import org.jeecg.modules.workorderUser.entity.WorkorderUser;
+import org.jeecg.modules.workorderUser.service.IWorkorderUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -48,6 +50,10 @@ import java.util.List;
 @Service
 public class TemplateServiceImpl implements TemplateService {
 
+    //用户信息
+    @Resource
+    private IWorkorderUserService workorderUserService;
+
     //收藏信息
     @Resource
     private IWorkorderCollectionService workorderCollectionService;
@@ -132,6 +138,7 @@ public class TemplateServiceImpl implements TemplateService {
                 //任务号
                 query.like(WorkorderTemplate::getTaskNo, templateBean.getTaskNo());
             }
+            query.orderByDesc(WorkorderTemplate::getCreateTime);
 
             //获取账本信息
             Page<WorkorderTemplate> pageList = query.page(page);
@@ -161,11 +168,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-修改工单
     @Override
-    public Result<?> updateTemplate(WorkorderTemplate workorderTemplate, String roleId) {
+    public Result<?> updateTemplate(WorkorderTemplate workorderTemplate, String token) {
         try{
-
             //判断是否有工序操作权限
-            boolean permission = judgePermissionTemplate(roleId);
+            boolean permission = judgePermissionTemplate(token);
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -551,10 +557,10 @@ public class TemplateServiceImpl implements TemplateService {
     /******************************************工单修改*****************************************************************/
     //工单信息-修改常规参数-工序卡1(选配)
     @Override
-    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String roleId) {
+    public Result<?> updateGeneralStepOne(WorkorderGeneralStepone generalStepone, String token) {
         try{
             //判断是否有工序操作权限
-            boolean permission = judgePermissionGeneral(roleId, generalStepone.getStepId());
+            boolean permission = judgePermissionGeneral(token, generalStepone.getStepId());
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -574,10 +580,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-修改常规参数-工序卡2
     @Override
-    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String roleId) {
+    public Result<?> updateGeneralStepTwo(WorkorderGeneralSteptwo generalSteptwo, String token) {
         try{
             //判断是否有工序操作权限
-            boolean permission = judgePermissionGeneral(roleId, generalSteptwo.getStepId());
+            boolean permission = judgePermissionGeneral(token, generalSteptwo.getStepId());
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -596,10 +602,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-修改常规参数-工序卡3
     @Override
-    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String roleId) {
+    public Result<?> updateGeneralStepThree(WorkorderGeneralStepthree generalStepthree, String token) {
         try{
             //判断是否有工序操作权限
-            boolean permission = judgePermissionGeneral(roleId, generalStepthree.getStepId());
+            boolean permission = judgePermissionGeneral(token, generalStepthree.getStepId());
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -618,10 +624,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-修改常规参数-工序卡4(总成)
     @Override
-    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String roleId) {
+    public Result<?> updateGeneralStepFour(WorkorderGeneralStepfour generalStepfour, String token) {
         try{
             //判断是否有工序操作权限
-            boolean permission = judgePermissionGeneral(roleId, generalStepfour.getStepId());
+            boolean permission = judgePermissionGeneral(token, generalStepfour.getStepId());
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -640,10 +646,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-修改工序参数-工序卡1(选配)
     @Override
-    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, String roleId) {
+    public Result<?> updateParamStepOne(WorkorderParamStepone paramStepone, String token) {
         try{
             //判断是否有工序操作权限
-            boolean permission = judgePermissionParam(roleId, paramStepone.getProcessId());
+            boolean permission = judgePermissionParam(token, paramStepone.getProcessId());
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -662,10 +668,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-修改工序参数-工序卡2
     @Override
-    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String roleId) {
+    public Result<?> updateParamStepTwo(WorkorderParamSteptwo paramSteptwo, String token) {
         try{
             //判断是否有工序操作权限
-            boolean permission = judgePermissionParam(roleId, paramSteptwo.getProcessId());
+            boolean permission = judgePermissionParam(token, paramSteptwo.getProcessId());
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -684,10 +690,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-修改工序参数-工序卡3
     @Override
-    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, String roleId) {
+    public Result<?> updateParamStepThree(WorkorderParamStepthree paramStepthree, String token) {
         try{
             //判断是否有工序操作权限
-            boolean permission = judgePermissionParam(roleId, paramStepthree.getProcessId());
+            boolean permission = judgePermissionParam(token, paramStepthree.getProcessId());
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -706,10 +712,10 @@ public class TemplateServiceImpl implements TemplateService {
 
     //工单信息-修改工序参数-工序卡4(总成)
     @Override
-    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, String roleId) {
+    public Result<?> updateParamStepFour(WorkorderParamStepfour paramStepfour, String token) {
         try{
             //判断是否有工序操作权限
-            boolean permission = judgePermissionParam(roleId, paramStepfour.getProcessId());
+            boolean permission = judgePermissionParam(token, paramStepfour.getProcessId());
             if(!permission){
                 return Result.error("没有该工序的操作权限");
             }
@@ -727,11 +733,15 @@ public class TemplateServiceImpl implements TemplateService {
     }
 
     //工单信息-检查项目参数修改权限判断
-    public Boolean judgePermissionParam(String roleId, String checkItemId)  {
+    public Boolean judgePermissionParam(String userId, String checkItemId)  {
         //返回结果
         boolean result = false;
 
         try{
+            //查询用户信息获取角色id
+            WorkorderUser user = workorderUserService.getById(userId);
+            String roleId = user.getRoleId();
+
             //根据角色id获取拥有的权限
             List<WorkorderPermissionCheckitem> permissionList = workorderPermissionCheckitemService
                     .lambdaQuery()
@@ -754,11 +764,14 @@ public class TemplateServiceImpl implements TemplateService {
     }
 
     //工单信息-常规参数修改权限判断
-    public Boolean judgePermissionGeneral(String roleId, String stepId) {
+    public Boolean judgePermissionGeneral(String userId, String stepId) {
         //返回结果
         boolean result = false;
 
         try{
+            //查询用户信息获取角色id
+            WorkorderUser user = workorderUserService.getById(userId);
+            String roleId = user.getRoleId();
 
             //根据角色id获取拥有的权限
             List<WorkorderPermissionStep> permissionList = workorderPermissionStepService
@@ -782,11 +795,14 @@ public class TemplateServiceImpl implements TemplateService {
     }
 
     //工单信息-基础修改权限判断
-    public Boolean judgePermissionTemplate(String roleId) {
+    public Boolean judgePermissionTemplate(String userId) {
         //返回结果
         boolean result = false;
 
         try{
+            //查询用户信息获取角色id
+            WorkorderUser user = workorderUserService.getById(userId);
+            String roleId = user.getRoleId();
 
             //根据角色id获取拥有的权限
             List<WorkorderPermissionTemplate> permissionList = workorderPermissionTemplateService
@@ -795,7 +811,7 @@ public class TemplateServiceImpl implements TemplateService {
                     .list();
 
             for (WorkorderPermissionTemplate permission : permissionList) {
-                if("1".equals(permission.getRoleId())){
+                if("1".equals(permission.getIsEdit())){
                     result = true;
                     break;
                 }
@@ -808,6 +824,15 @@ public class TemplateServiceImpl implements TemplateService {
         }
     }
 
+    //根据userId查询用户角色信息
+    public String getRoleId(String userId){
+
+        WorkorderUser user = workorderUserService.getById(userId);
+        String roleId = user.getRoleId();
+
+        return roleId;
+    }
+
     /*********************************************************************************************************/
     //工单信息-查询工单详情
     @Override

jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/UserServiceImpl.java

@@ -10,6 +10,10 @@ import org.jeecg.modules.workorderPermission.entity.WorkorderPermission;
 import org.jeecg.modules.workorderPermission.service.IWorkorderPermissionService;
 import org.jeecg.modules.workorderPermissionRole.entity.WorkorderPermissionRole;
 import org.jeecg.modules.workorderPermissionRole.service.IWorkorderPermissionRoleService;
+import org.jeecg.modules.workorderPermissionTemplate.entity.WorkorderPermissionTemplate;
+import org.jeecg.modules.workorderPermissionTemplate.service.IWorkorderPermissionTemplateService;
+import org.jeecg.modules.workorderPermissionUser.entity.WorkorderPermissionUser;
+import org.jeecg.modules.workorderPermissionUser.service.IWorkorderPermissionUserService;
 import org.jeecg.modules.workorderRole.entity.WorkorderRole;
 import org.jeecg.modules.workorderRole.service.IWorkorderRoleService;
 import org.jeecg.modules.workorderUser.entity.WorkorderUser;
@@ -18,7 +22,9 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class UserServiceImpl implements UserService {
@@ -31,13 +37,17 @@ public class UserServiceImpl implements UserService {
     @Resource
     private IWorkorderRoleService workorderRoleService;
 
-    //权限信息
-    @Resource
-    private IWorkorderPermissionService workorderPermissionService;
-
     //角色权限信息
     @Resource
-    private IWorkorderPermissionRoleService workorderPermissionRoleService;
+    private IWorkorderPermissionUserService workorderPermissionUserService;
+
+//    //权限信息
+//    @Resource
+//    private IWorkorderPermissionService workorderPermissionService;
+//
+//    //角色权限信息
+//    @Resource
+//    private IWorkorderPermissionRoleService workorderPermissionRoleService;
     /*************************************************************************************/
 
     //查询用户列表
@@ -67,14 +77,32 @@ public class UserServiceImpl implements UserService {
 
     //用户信息-根据id查询用户信息
     @Override
-    public Result<?> queryUserById(String userId) {
-        WorkorderUser user = new WorkorderUser();
+    public Result<?> queryUserById(String token, String userId) {
+        //返回数据
+        Map<String, Object> map = new HashMap<>();
+        WorkorderUser user = null;
+
         try{
-            //查询公告信息详情
+            boolean permission = false;
+            //判断是否有查看权限
+            if(token.equals(userId)){
+                //是本人可以直接查看
+                permission = true;
+            }else {
+                //非本人查询是否有查看权限
+                permission = judgePermissionTemplate(token);
+                map.put("permission", permission);
+            }
+            if(!permission){
+                return Result.error("没有查看权限");
+            }
+
+            //查询用户信息详情
             user = workorderUserService
                     .lambdaQuery()
                     .eq(WorkorderUser::getId, userId)
                     .one();
+            map.put("user", user);
 
             //获取用户角色信息
             WorkorderRole role = workorderRoleService
@@ -82,27 +110,7 @@ public class UserServiceImpl implements UserService {
                     .eq(WorkorderRole::getId, user.getRoleId())
                     .one();
             user.setRoleName(role.getName());
-
-            //获取角色权限信息
-            //1、获取权限信息
-            List<WorkorderPermission> permissionList = workorderPermissionService
-                    .lambdaQuery()
-                    .list();
-            //2、获取角色关联权限
-            List<WorkorderPermissionRole> permissionRoleList = workorderPermissionRoleService
-                    .lambdaQuery()
-                    .eq(WorkorderPermissionRole::getRoleId, role.getId())
-                    .list();
-
-            //添加权限名称
-            for (WorkorderPermissionRole workorderPermissionRole : permissionRoleList) {
-                for (WorkorderPermission permission : permissionList) {
-                    if(workorderPermissionRole.getPermissionId().equals(permission.getId())){
-                        workorderPermissionRole.setPermissionName(permission.getName());
-                    }
-                }
-            }
-            user.setPermissionRoleList(permissionRoleList);
+            map.put("role", role);
 
             return Result.OK("用户信息详情", user);
         }catch (Exception e){
@@ -115,7 +123,12 @@ public class UserServiceImpl implements UserService {
     //登录
     @Override
     public Result<?> login(String userName, String password) {
-        WorkorderUser user = new WorkorderUser();
+        //返回信息
+        String message = "登录失败";
+
+        //返回数据
+        Map<String, Object> map = new HashMap<>();
+        WorkorderUser user = null;
         try{
             //查询用户信息详情
             user = workorderUserService
@@ -123,6 +136,7 @@ public class UserServiceImpl implements UserService {
                     .eq(WorkorderUser::getName, userName)
                     .eq(WorkorderUser::getPassword, password)
                     .one();
+            map.put("user", user);
 
             if(null != user){
                 //获取用户角色信息
@@ -131,27 +145,11 @@ public class UserServiceImpl implements UserService {
                         .eq(WorkorderRole::getId, user.getRoleId())
                         .one();
                 user.setRoleName(role.getName());
+                map.put("role", role);
 
-                //获取角色权限信息
-                //1、获取权限信息
-                List<WorkorderPermission> permissionList = workorderPermissionService
-                        .lambdaQuery()
-                        .list();
-                //2、获取角色关联权限
-                List<WorkorderPermissionRole> permissionRoleList = workorderPermissionRoleService
-                        .lambdaQuery()
-                        .eq(WorkorderPermissionRole::getRoleId, role.getId())
-                        .list();
-
-                //添加权限名称
-                for (WorkorderPermissionRole workorderPermissionRole : permissionRoleList) {
-                    for (WorkorderPermission permission : permissionList) {
-                        if(workorderPermissionRole.getPermissionId().equals(permission.getId())){
-                            workorderPermissionRole.setPermissionName(permission.getName());
-                        }
-                    }
-                }
-                user.setPermissionRoleList(permissionRoleList);
+                //获取用户是否具有修改其他用户的权限
+                boolean permission = judgePermissionTemplate(user.getId());
+                map.put("permission", permission);
 
                 return Result.OK("用户登录成功", user);
             }else {
@@ -193,8 +191,23 @@ public class UserServiceImpl implements UserService {
 
     //修改用户信息
     @Override
-    public Result<?> updateUser(WorkorderUser workorderUser) {
+    public Result<?> updateUser(String token, WorkorderUser workorderUser) {
         try{
+            boolean permission = false;
+
+            //判断是否有修改权限
+            if(token.equals(workorderUser.getId())){
+                //是本人可以直接修改
+                permission = true;
+            }else {
+                //非本人查询是否有修改权限
+                permission = judgePermissionTemplate(token);
+            }
+            if(!permission){
+                return Result.error("没有修改权限");
+            }
+
+
             boolean flag = workorderUserService.updateById(workorderUser);
             if(flag){
                 return Result.OK("修改用户信息成功！");
@@ -208,6 +221,34 @@ public class UserServiceImpl implements UserService {
     }
 
 
+    //工单信息-基础修改权限判断
+    public Boolean judgePermissionTemplate(String userId) {
+        //返回结果
+        boolean result = false;
 
+        try{
+            //查询用户信息获取角色id
+            WorkorderUser user = workorderUserService.getById(userId);
+            String roleId = user.getRoleId();
+
+            //根据角色id获取拥有的权限
+            List<WorkorderPermissionUser> permissionList = workorderPermissionUserService
+                    .lambdaQuery()
+                    .eq(WorkorderPermissionUser::getRoleId, roleId)
+                    .list();
+
+            for (WorkorderPermissionUser permission : permissionList) {
+                if("1".equals(permission.getIsEdit())){
+                    result = true;
+                    break;
+                }
+            }
+
+            return result;
+        }catch (Exception e){
+            e.printStackTrace();
+            return  result;
+        }
+    }
 
 }