Merge remote-tracking branch 'origin/master'

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -151,7 +151,7 @@ public class SysDepartController {
     /**
      * @description: 根据当前登录角色查询 下级部门数据
      * @param: [parentId, ids, primaryKey]
-     * @return: org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.system.model.SysDepartTreeModel>>
+     * @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
      */
@@ -174,7 +174,7 @@ public class SysDepartController {
     /**
      * @description: 法人注册时，只显示市和县区科技局，不显示下属单位
      * @param: [parentId, ids, primaryKey]
-     * @return: org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.system.model.SysDepartTreeModel>>
+     * @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
      */
@@ -244,8 +244,11 @@ public class SysDepartController {
         //单位法人角色时，只查询自己部门
         if ("faren_admin".equals(user.getRoleCode())) {
             queryWrapper.eq("id", user.getOrgId());
-        } else { // 查询下级部门
+        } else if ("quxian_admin".equals(user.getRoleCode())) {
             queryWrapper.eq("parent_id", user.getOrgId());
+        } else if ("kejiju_admin".equals(user.getRoleCode())) {// 查询所有法人级部门
+            queryWrapper.ne("depart_name_abbr","null");
+            queryWrapper.ne("depart_name_abbr","");
         }
         return sysDepartService.queryPageList(req, queryWrapper, pageSize, pageNo);
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java

@@ -8,7 +8,6 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -166,14 +165,14 @@ public class SysUserController {
     /**
      * @description: 根据用户角色查询下属用户
      * @param: [user, pageNo, pageSize, req]
-     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage<org.jeecg.modules.system.entity.SysUser>>
+     * @return: org.jeecg.common.api.vo.Result<com.baomidou.mybatisplus.core.metadata.IPage < org.jeecg.modules.system.entity.SysUser>>
      * @author: z.h.c
      * @date: 24/11/8 15:19
      */
 //    @RequiresPermissions("system:user:listAll")
     @RequestMapping(value = "/listByRollCode", method = RequestMethod.GET)
     public Result<IPage<SysUser>> listByRollCode(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
 
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -192,21 +191,17 @@ public class SysUserController {
      */
     @RequestMapping(value = "/getDeclarantList", method = RequestMethod.GET)
     public Result<IPage<SysUser>> getDeclarantList(SysUser user, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        user.setUserType("shenbaoren");
         String roleCode = loginUser.getRoleCode();
-        List<String> userIds = new LinkedList<>();
+//        List<String> userIds = new LinkedList<>();
         //申报人是只查询自己
-        if (StringUtils.equals(roleCode, "shenbaoren_role")) {
-            userIds.add(loginUser.getId());
-        } else if (StringUtils.equals(roleCode, "faren_admin")) {
-            List<SysUserDepart> departList = sysUserDepartService.list(new LambdaQueryWrapper<SysUserDepart>().eq(SysUserDepart::getDepId, loginUser.getOrgId()));
-            userIds = Optional.ofNullable(departList).orElse(new LinkedList<>()).stream().map(u -> u.getUserId()).collect(Collectors.toList());
-        }
-        user.setUserType("shenbaoren");
         QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
-        if (ObjectUtil.isNotEmpty(userIds)) {
-            queryWrapper.in("id", userIds);
+        if (StringUtils.equals(roleCode, "shenbaoren_role")) {
+            queryWrapper.eq("org_code", loginUser.getOrgCode());
+        } else {
+            queryWrapper.likeRight("org_code", loginUser.getOrgCode());
         }
         return sysUserService.queryPageList(req, queryWrapper, pageSize, pageNo);
     }
@@ -1967,7 +1962,7 @@ public class SysUserController {
 
         SysDepart depart = sysDepartService.getById(departmentid);
         //所先部门状态为0时，说明该部门注册后未通过审核，申报人此时不能选择该部门注册
-        if(StringUtils.equals(depart.getStatus(),"0")){
+        if (StringUtils.equals(depart.getStatus(), "0")) {
             throw new JeecgBootException("该单位未通过审核,暂时不能注册为该单位申报人");
         }
 

jeecgboot-vue3/src/views/declarantUnit/declarantUnitList.vue

@@ -182,7 +182,7 @@ function getTableAction(record) {
     // },
     {
       label: '驳回',
-      ifShow: userStore.getUserInfo.roleCode !='faren_admin' && record.status == 1,
+      ifShow: userStore.getUserInfo.roleCode =='quxian_admin' && record.status == 1,
       popConfirm: {
         title: '确定驳回吗?',
         confirm: handleFrozen.bind(null, record, 0),
@@ -190,7 +190,7 @@ function getTableAction(record) {
     },
     {
       label: '通过',
-      ifShow: userStore.getUserInfo.roleCode !='faren_admin' && record.status == 0,
+      ifShow: userStore.getUserInfo.roleCode =='quxian_admin' && record.status == 0,
       popConfirm: {
         title: '确定通过吗?',
         confirm: handleFrozen.bind(null, record, 1),

jeecgboot-vue3/src/views/declarantUnit/depart.user.data.ts

@@ -15,11 +15,11 @@ export const columns: BasicColumn[] = [
     align:"center",
     dataIndex: 'departNameAbbr',
   },
-  {
+ /* {
     title: '编码',
     align:"center",
     dataIndex: 'orgCode'
-  },
+  },*/
   {
     title: '手机号',
     align:"center",

jeecgboot-vue3/src/views/projectApplication/project/ProjectList.vue

@@ -5,7 +5,7 @@
       <!--插槽:table标题-->
       <template #tableTitle>
 <!--        <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>-->
-<!--        <a-button type="primary" @click="go_xinjianshenbao" preIcon="ant-design:plus-outlined"> 新建审报书</a-button>-->
+<!--        <a-button type="primary" @click="go_xinjianshenbao" 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" v-auth="'project:project:importExcel'" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>-->
         <a-dropdown>
@@ -24,7 +24,7 @@
               </a-menu-item>-->
             </a-menu>
           </template>
-          <a-button type="primary">新建审报
+          <a-button type="primary">新建申报
             <Icon icon="mdi:chevron-down"></Icon>
           </a-button>
         </a-dropdown>
@@ -91,7 +91,7 @@ const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
       ],
     },
     actionColumn: {
-      width: 320,
+      width: 380,
       fixed:'right'
     },
     beforeFetch: (params) => {