问题修改 11.09

2 weeks ago · 9882772f86
parent 5002adaa4b
commit 9882772f86
10 changed files with 682 additions and 614 deletions
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/LoginController.java
@ -4,10 +4,12 @@ import cn.hutool.core.util.RandomUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.aliyuncs.exceptions.ClientException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.jeecg.common.api.vo.Result;
@ -21,10 +23,7 @@ import org.jeecg.common.util.*;
 import org.jeecg.common.util.encryption.EncryptedString;
 import org.jeecg.config.JeecgBaseConfig;
 import org.jeecg.modules.base.service.BaseCommonService;
-import org.jeecg.modules.system.entity.SysDepart;
-import org.jeecg.modules.system.entity.SysRoleIndex;
-import org.jeecg.modules.system.entity.SysTenant;
-import org.jeecg.modules.system.entity.SysUser;
+import org.jeecg.modules.system.entity.*;
 import org.jeecg.modules.system.model.SysLoginModel;
 import org.jeecg.modules.system.service.*;
 import org.jeecg.modules.system.service.impl.SysBaseApiImpl;
@ -38,7 +37,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.*;
-import java.util.stream.Collectors;

 /**
 * @Author scott
@ -68,6 +66,12 @@ public class LoginController {
 	@Autowired
 	private JeecgBaseConfig jeecgBaseConfig;

+	@Autowired
+	private ISysUserRoleService sysUserRoleService;
+
+	@Autowired
+	private ISysRoleService sysRoleService;
+
 	private final String BASE_CHECK_CODES = "qwertyuiplkjhgfdsazxcvbnmQWERTYUPLKJHGFDSAZXCVBNM1234567890";

 	@ApiOperation("登录接口")
@ -162,6 +166,14 @@ public class LoginController {
 			//update-end---author:scott ---date::2022-06-20  for：vue3前端，支持自定义首页--------------
 			log.info("2 获取用户信息耗时 (首页面配置)" + (System.currentTimeMillis() - start) + "毫秒");

+			List<SysUserRole> userRole = sysUserRoleService.list(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, sysUser.getId()));
+			if(ObjectUtils.isNotEmpty(userRole)){
+				String rollId =  userRole.get(0).getRoleId();
+				SysRole sysRole = sysRoleService.getById(rollId);
+                if(ObjectUtils.isNotEmpty(sysRole)){
+                    sysUser.setRoleCode(sysRole.getRoleCode());
+                }
+			}
 			obj.put("userInfo",sysUser);
 			obj.put("sysAllDictItems", sysDictService.queryAllDictItems());
 			log.info("3 获取用户信息耗时 (字典数据)" + (System.currentTimeMillis() - start) + "毫秒");
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@ -1,6 +1,5 @@
 package org.jeecg.modules.system.controller;

-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@ -17,7 +16,6 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.ImportExcelUtil;
-import org.jeecg.common.util.YouBianCodeUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.config.mybatis.MybatisPlusSaasConfig;
 import org.jeecg.modules.system.entity.SysDepart;
@ -67,6 +65,7 @@ public class SysDepartController {
    private ISysUserService sysUserService;
    @Autowired
    private ISysUserDepartService sysUserDepartService;
+
    /**
     * 查询数据 查出我的部门,并以树结构数据格式响应给前端
     *
@ -127,6 +126,7 @@ public class SysDepartController {

    /**
     * 异步查询部门list
+     *
     * @param parentId   父节点 异步加载时传递
     * @param ids        前端回显是传递
     * @param primaryKey 主键字段（id或者orgCode）
@ -147,6 +147,29 @@ public class SysDepartController {
        return result;
    }

+    /**
+     * @description: 根据当前登录角色查询 下级部门数据
+     * @param: [parentId, ids, primaryKey]
+     * @return: org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.system.model.SysDepartTreeModel>>
+     * @author: z.h.c
+     * @date: 24/11/9 16:07
+     */
+    @RequestMapping(value = "/queryDepartTreeSync4ZhuGuanBuMen", method = RequestMethod.GET)
+    public Result<List<SysDepartTreeModel>> queryDepartTreeSync4ZhuGuanBuMen(@RequestParam(name = "parentOrgCode", required = false) String parentOrgCode, @RequestParam(name = "ids", required = false) String ids, @RequestParam(name = "primaryKey", required = false) String primaryKey) {
+        Result<List<SysDepartTreeModel>> result = new Result<>();
+        SysDepart sysDepart = sysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode, parentOrgCode));
+        try {
+            List<SysDepartTreeModel> list = sysDepartService.queryTreeListByPid(sysDepart.getId(), ids, primaryKey);
+            result.setResult(list);
+            result.setSuccess(true);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.setSuccess(false);
+            result.setMessage("查询失败");
+        }
+        return result;
+    }
+
    /**
     * 获取某个部门的所有父级部门的ID
     *
@ -189,7 +212,13 @@ public class SysDepartController {
 //		List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>()
        QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(depart, req.getParameterMap());
        queryWrapper.eq("del_flag", 0);
+
+        //单位法人角色时，只查询自己部门
+        if ("faren_admin".equals(user.getRoleCode())) {
+            queryWrapper.eq("id", user.getOrgId());
+        } else { // 查询下级部门
            queryWrapper.eq("parent_id", user.getOrgId());
+        }
        return sysDepartService.queryPageList(req, queryWrapper, pageSize, pageNo);

    }
@ -229,7 +258,7 @@ public class SysDepartController {
     * @param sysDepart
     * @return
     */
-    @RequiresPermissions("system:depart:add")
+//    @RequiresPermissions("system:depart:add")
    @RequestMapping(value = "/add", method = RequestMethod.POST)
    @CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
    public Result<SysDepart> add(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
@ -255,7 +284,7 @@ public class SysDepartController {
     * @param sysDepart
     * @return
     */
-    @RequiresPermissions("system:depart:edit")
+//    @RequiresPermissions("system:depart:edit")
    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
    @CacheEvict(value = {CacheConstant.SYS_DEPARTS_CACHE, CacheConstant.SYS_DEPART_IDS_CACHE}, allEntries = true)
    public Result<SysDepart> edit(@RequestBody SysDepart sysDepart, HttpServletRequest request) {
@ -280,6 +309,7 @@ public class SysDepartController {

    /**
     * 通过id删除
+     *
     * @param id
     * @return
     */
@ -544,6 +574,7 @@ public class SysDepartController {

    /**
     * 查询所有部门信息
+     *
     * @return
     */
    @GetMapping("listAll")
@ -560,6 +591,7 @@ public class SysDepartController {
        result.setResult(ls);
        return result;
    }
+
    /**
     * 查询数据 查出所有部门,并以树结构数据格式响应给前端
     *
@ -619,9 +651,9 @@ public class SysDepartController {
    }

    /**
-	 * @功能：根据id 批量查询
     * @param deptIds
     * @return
+     * @功能：根据id 批量查询
     */
    @RequestMapping(value = "/queryByIds", method = RequestMethod.GET)
    public Result<Collection<SysDepart>> queryByIds(@RequestParam(name = "deptIds") String deptIds) {
@ -642,6 +674,7 @@ public class SysDepartController {

    /**
     * 异步查询部门list
+     *
     * @param parentId 父节点 异步加载时传递
     * @return
     */
@ -662,6 +695,7 @@ public class SysDepartController {

    /**
     * 通过部门id和租户id获取用户 【低代码应用: 用于选择部门负责人】
+     *
     * @param departId
     * @return
     */
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/entity/SysUser.java
@ -222,4 +222,7 @@ public class SysUser implements Serializable {
     */
    @TableField(exist = false)
    private boolean izBindThird;
+
+    @TableField(exist = false)
+    private String roleCode;
 }
--- a/jeecgboot-vue3/src/views/declarant/user.data.ts
+++ b/jeecgboot-vue3/src/views/declarant/user.data.ts
@ -175,7 +175,7 @@ export const formSchema: FormSchema[] = [
    required: true,
    component: 'Input',
  },
-  {
+  /*{
    label: '工号',
    field: 'workNo',
    required: true,
@ -190,7 +190,7 @@ export const formSchema: FormSchema[] = [
    componentProps: {
      labelKey: 'name',
    },
-  },
+  },*/
  {
    label: '角色',
    field: 'selectedroles',
@ -234,7 +234,7 @@ export const formSchema: FormSchema[] = [
      };
    },
  },
-  {
+  /*{
    label: '租户',
    field: 'relTenantIds',
    component: 'ApiSelect',
@ -263,8 +263,8 @@ export const formSchema: FormSchema[] = [
        },
      };
    },
-  },
-  {
+  },*/
+  /*{
    label: '负责部门',
    field: 'departIds',
    component: 'Select',
@ -272,7 +272,7 @@ export const formSchema: FormSchema[] = [
      mode: 'multiple',
    },
    ifShow: ({ values }) => values.userIdentity == 2,
-  },
+  },*/
  {
    label: '头像',
    field: 'avatar',
@ -320,13 +320,13 @@ export const formSchema: FormSchema[] = [
      ];
    },
  },
-  {
+  /*{
    label: '座机',
    field: 'telephone',
    component: 'Input',
    rules: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' }],
-  },
-  {
+  },*/
+  /*{
    label: '工作流引擎',
    field: 'activitiSync',
    defaultValue: 1,
@ -336,7 +336,7 @@ export const formSchema: FormSchema[] = [
      type: 'radio',
      stringToNumber: true,
    },
-  },
+  },*/
 ];

 export const formPasswordSchema: FormSchema[] = [
--- a/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
+++ b/jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue
@ -58,6 +58,8 @@ import {useMessage} from "@/hooks/web/useMessage";
 const queryParam = reactive<any>({});
 const checkedKeys = ref<Array<string | number>>([]);
 const userStore = useUserStore();
+// console.log("userStore.getUserInfo---",JSON.stringify(userStore.getUserInfo))
+// console.log("userStore.getRoleList---",userStore.getRoleList)
 const {createMessage, createConfirm} = useMessage();

 //注册model
@ -180,7 +182,7 @@ function getTableAction(record) {
    // },
    {
      label: '驳回',
-      ifShow: record.status == 1,
+      ifShow: userStore.getUserInfo.roleCode !='faren_admin' && record.status == 1,
      popConfirm: {
        title: '确定驳回吗?',
        confirm: handleFrozen.bind(null, record, 0),
@ -188,7 +190,7 @@ function getTableAction(record) {
    },
    {
      label: '通过',
-      ifShow: record.status == 0,
+      ifShow: userStore.getUserInfo.roleCode !='faren_admin' && record.status == 0,
      popConfirm: {
        title: '确定通过吗?',
        confirm: handleFrozen.bind(null, record, 1),
@ -196,6 +198,7 @@ function getTableAction(record) {
    },
    {
      label: '删除',
+      ifShow: userStore.getUserInfo.roleCode !='faren_admin',
      popConfirm: {
        title: '是否确认删除',
        confirm: handleDelete.bind(null, record),
--- a/jeecgboot-vue3/src/views/system/depart/components/DepartLeftTree.vue
+++ b/jeecgboot-vue3/src/views/system/depart/components/DepartLeftTree.vue
@ -3,9 +3,9 @@
    <div class="j-table-operator" style="width: 100%">
      <a-button type="primary" preIcon="ant-design:plus-outlined" @click="onAddDepart">新增</a-button>
      <a-button type="primary" preIcon="ant-design:plus-outlined" @click="onAddChildDepart()">添加下级</a-button>
-      <a-upload name="file" :showUploadList="false" :customRequest="onImportXls">
+<!--      <a-upload name="file" :showUploadList="false" :customRequest="onImportXls">
        <a-button type="primary" preIcon="ant-design:import-outlined">导入</a-button>
-      </a-upload>
+      </a-upload>-->
      <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls">导出</a-button>
 <!--      <a-button type="primary" preIcon="ant-design:sync-outlined">同步企微?</a-button>
      <a-button type="primary" preIcon="ant-design:sync-outlined">同步钉钉?</a-button>-->
@ -92,10 +92,11 @@
  import { useModal } from '/@/components/Modal';
  import { useMessage } from '/@/hooks/web/useMessage';
  import { useMethods } from '/@/hooks/system/useMethods';
-  import { Api, deleteBatchDepart, queryDepartTreeSync } from '../depart.api';
+  import { Api, deleteBatchDepart, queryDepartTreeSync4ZhuGuanBuMen } from '../depart.api';
  import { searchByKeywords } from '/@/views/system/departUser/depart.user.api';
  import DepartFormModal from '/@/views/system/depart/components/DepartFormModal.vue';
  import { Popconfirm } from 'ant-design-vue';
+  import {useUserStore} from "@/store/modules/user";

  const prefixCls = inject('prefixCls');
  const emit = defineEmits(['select', 'rootTreeData']);
@ -124,13 +125,16 @@

  // 注册 modal
  const [registerModal, { openModal }] = useModal();
+  const userStore = useUserStore();

  // 加载顶级部门信息
  async function loadRootTreeData() {
    try {
      loading.value = true;
      treeData.value = [];
-      const result = await queryDepartTreeSync();
+      const result = await queryDepartTreeSync4ZhuGuanBuMen({
+        parentOrgCode: userStore.getUserInfo.orgCode,
+      });
      if (Array.isArray(result)) {
        treeData.value = result;
      }
@ -158,8 +162,9 @@
  // 加载子级部门信息
  async function loadChildrenTreeData(treeNode) {
    try {
-      const result = await queryDepartTreeSync({
-        pid: treeNode.dataRef.id,
+      const result = await queryDepartTreeSync4ZhuGuanBuMen({
+        // pid: treeNode.dataRef.id,
+        parentOrgCode: treeNode.dataRef.orgCode,
      });
      if (result.length == 0) {
        treeNode.dataRef.isLeaf = true;
--- a/jeecgboot-vue3/src/views/system/depart/depart.api.ts
+++ b/jeecgboot-vue3/src/views/system/depart/depart.api.ts
@ -6,6 +6,7 @@ const { createConfirm } = useMessage();

 export enum Api {
  queryDepartTreeSync = '/sys/sysDepart/queryDepartTreeSync',
+  queryDepartTreeSync4ZhuGuanBuMen = '/sys/sysDepart/queryDepartTreeSync4ZhuGuanBuMen',
  save = '/sys/sysDepart/add',
  edit = '/sys/sysDepart/edit',
  delete = '/sys/sysDepart/delete',
@ -31,6 +32,9 @@ export enum Api {
 */
 export const queryDepartTreeSync = (params?) => defHttp.get({ url: Api.queryDepartTreeSync, params });

+// 根据当前登录角色查询 主管部门数据 add by zhc 11.09
+export const queryDepartTreeSync4ZhuGuanBuMen = (params?) => defHttp.get({ url: Api.queryDepartTreeSync4ZhuGuanBuMen, params });
+
 /**
 * 保存或者更新部门角色
 */
--- a/jeecgboot-vue3/src/views/system/depart/depart.data.ts
+++ b/jeecgboot-vue3/src/views/system/depart/depart.data.ts
@ -81,10 +81,13 @@ export function useBasicFormSchema() {
 // 机构类型选项
 export const orgCategoryOptions = {
  // 一级部门
-  root: [{ value: '1', label: '公司' }],
+  // root: [{ value: '1', label: '公司' }],
+  root: [{ value: '1', label: '管理单位' }],
  // 子级部门
  child: [
-    { value: '2', label: '部门' },
-    { value: '3', label: '岗位' },
+    // { value: '2', label: '部门' },
+    { value: '2', label: '直属法人单位' },
+    // { value: '3', label: '岗位' },
+    { value: '3', label: '县区法人单位' },
  ],
 };
--- a/jeecgboot-vue3/src/views/system/departUser/depart.user.data.ts
+++ b/jeecgboot-vue3/src/views/system/departUser/depart.user.data.ts
@ -163,11 +163,14 @@ export function useBaseInfoForm(treeData: Ref<any[]>) {
      label: '机构类型',
      render(val) {
        if (val === '1') {
-          return '公司';
+          // return '公司';
+          return '管理单位';
        } else if (val === '2') {
-          return '部门';
+          // return '部门';
+          return '直属法人单位';
        } else if (val === '3') {
-          return '岗位';
+          // return '岗位';
+          return '县区法人单位';
        }
        return val;
      },
--- a/jeecgboot-vue3/types/store.d.ts
+++ b/jeecgboot-vue3/types/store.d.ts
@ -40,6 +40,7 @@ export interface UserInfo {
  homePath?: string;
  tenantid?: string | number;
  roles: RoleInfo[];
+  roleCode: string;
  orgCode?: string;
 }