处理权限模块

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/SysFunction.java

@@ -64,72 +64,6 @@ public class SysFunction extends Model<SysFunction> {
     @TableField("use_state")
     private Boolean useState;
 
-    /**
-     * 是否属于工时管理模块
-     */
-    @TableField("package_time")
-    private Integer packageTime;
-
-    /**
-     * 是否属于任务协同办公
-     */
-    @TableField("package_project")
-    private Integer packageProject;
-
-    /**
-     * 是否属于OA, 请假出差等
-     */
-    @TableField("package_oa")
-    private Integer packageOa;
-
-    /**
-     * 是否属于费用报销
-     */
-    @TableField("package_expense")
-    private Integer packageExpense;
-
-    /**
-     * 是否属于客户管理
-     */
-    @TableField("package_customer")
-    private Integer packageCustomer;
-
-    /**
-     * 是否属于专业工程管理
-     */
-    @TableField("package_engineering")
-    private Integer packageEngineering;
-
-    /**
-     * 是否属于合同管理
-     */
-    @TableField("package_contract")
-    private Integer packageContract;
-
-    /**
-     * 是否属于生产车间管理
-     */
-    @TableField("package_etimecard")
-    private Integer packageEtimecard;
-
-    /**
-     * 是否属于财务核算成本
-     */
-    @TableField("package_finance")
-    private Integer packageFinance;
-
-    /**
-     * 是否属于同步企业微信
-     */
-    @TableField("sync_corpwx_time")
-    private Integer syncCorpwxTime;
-
-    /**
-     * 财务上传是否需要审核
-     */
-    @TableField("finance_audit")
-    private Integer financeAudit;
-
     /**
      * 备注
      */

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/SysModule.java

@@ -17,7 +17,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2022-07-07
+ * @since 2023-07-13
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -74,73 +74,6 @@ public class SysModule extends Model<SysModule> {
     @TableField("use_state")
     private Boolean useState;
 
-    /**
-     * 是否属于工时管理模块
-     */
-    @TableField("package_time")
-    private Integer packageTime;
-
-    /**
-     * 是否属于任务协同办公
-     */
-    @TableField("package_project")
-    private Integer packageProject;
-
-    /**
-     * 是否属于OA, 请假出差等
-     */
-    @TableField("package_oa")
-    private Integer packageOa;
-
-    /**
-     * 是否属于费用报销
-     */
-    @TableField("package_expense")
-    private Integer packageExpense;
-
-    /**
-     * 是否属于客户管理
-     */
-    @TableField("package_customer")
-    private Integer packageCustomer;
-
-    /**
-     * 是否属于专业工程管理
-     */
-    @TableField("package_engineering")
-    private Integer packageEngineering;
-
-    /**
-     * 是否属于合同管理
-     */
-    @TableField("package_contract")
-    private Integer packageContract;
-
-    /**
-     * 是否属于生产车间管理
-     */
-    @TableField("package_etimecard")
-    private Integer packageEtimecard;
-
-    /**
-     * 是否属于自定义审批流
-     */
-    @TableField("report_workflow")
-    private Integer reportWorkflow;
-
-    /**
-     * 是否属于财务核算成本
-     */
-    @TableField("package_finance")
-    private Integer packageFinance;
-
-    /**
-     * 是否属于导入审核控制
-     */
-    @TableField("need_dept_audit")
-    private Integer needDeptAudit;
-
-
     @TableField(exist = false)
     private List<SysModule> children;
 
@@ -151,13 +84,6 @@ public class SysModule extends Model<SysModule> {
     @TableField(exist = false)
     private List<SysFunction> functionList;
 
-    /**
-     * 是否属于供应商模块
-     */
-    @TableField("package_provider")
-    private Integer packageProvider;
-
-
     @Override
     protected Serializable pkVal() {
         return this.id;

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/UserServiceImpl.java

@@ -534,53 +534,19 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         Company company = companyMapper.selectById(user.getCompanyId());
         TimeType timeType = timeTypeMapper.selectById(company.getId());
         //按照公司开通的模块进行匹配
-        QueryWrapper<SysModule> queryWrapper = new QueryWrapper<SysModule>().eq("package_time", 1);
-        if (company.getPackageProject() == 1) {
-            queryWrapper.or().eq("package_project", 1);
-        }
-        if (company.getPackageOa() == 1) {
-            queryWrapper.or().eq("package_oa", 1);
-        }
-        if (company.getPackageExpense() == 1) {
-            queryWrapper.or().eq("package_expense", 1);
-        }
-        if (company.getPackageCustomer() == 1) {
-            queryWrapper.or().eq("package_customer", 1);
-        }
-        if (company.getPackageEngineering() == 1) {
-            queryWrapper.or().eq("package_engineering", 1);
-        }
-        if (company.getPackageContract() == 1) {
-            queryWrapper.or().eq("package_contract", 1);
-        }
-        if (company.getPackageEtimecard()== 1) {
-            queryWrapper.or().eq("package_etimecard", 1);
-        }
-        if (company.getPackageFinance() == 1) {
-            queryWrapper.or().eq("package_finance", 1);
-        }
-        if (company.getPackageProvider() == 1) {
-            queryWrapper.or().eq("package_provider", 1);
-        }
-        if (timeType.getReportWorkflow() == 1) {
-            queryWrapper.or().eq("report_workflow", 1);
-        }
-        if (timeType.getNeedDeptAudit() == 1) {
-            queryWrapper.or().eq("need_dept_audit", 1);
-        }
-
+        QueryWrapper<SysModule> queryWrapper = new QueryWrapper<SysModule>();
         queryWrapper.orderByAsc("orderitem");
 
         //返回菜单
         List<SysRoleModule> rModules = sysRoleModuleMapper.selectList(new QueryWrapper<SysRoleModule>().eq("role_id", roleId));
         List<Integer> ids = rModules.stream().map(SysRoleModule::getModuleId).collect(Collectors.toList());
-        //项目报告审核模块,如果参与日报的审核，需要自动加上, 或者担任任务分组负责人
+/*        //项目报告审核模块,如果参与日报的审核，需要自动加上, 或者担任任务分组负责人
         if (user.isLeader() || user.isHasAuditDept() || (company.getPackageProject() == 1 && taskGroupMapper.selectCount(new QueryWrapper<TaskGroup>().eq("incharger_id", user.getId())) > 0)) {
             SysModule projectAuditModule = sysModuleMapper.selectOne(new QueryWrapper<SysModule>().eq("name", "项目报告审核"));
             if (!ids.contains(projectAuditModule.getId())) {
                 ids.add(projectAuditModule.getId());
             }
-        }
+        }*/
 
         List<SysModule> moduleList = sysModuleMapper.selectList(queryWrapper);
 
@@ -656,44 +622,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
             if (formIds.size() == 0) {
                 formIds.add(-1);
             }
-            QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().and(wrapper1->wrapper1.isNull("report_form_id").or().in("report_form_id",formIds)).and(wrapper->{
-                wrapper.eq("package_time", 1);
-                if (company.getPackageProject() == 1) {
-                    wrapper.or().eq("package_project", 1);
-                }
-                if (company.getPackageOa() == 1) {
-                    wrapper.or().eq("package_oa", 1);
-                }
-                if (company.getPackageExpense() == 1) {
-                    wrapper.or().eq("package_expense", 1);
-                }
-                if (company.getPackageCustomer() == 1) {
-                    wrapper.or().eq("package_customer", 1);
-                }
-                if (company.getPackageEngineering() == 1) {
-                    wrapper.or().eq("package_engineering", 1);
-                }
-                if (company.getPackageContract() == 1) {
-                    wrapper.or().eq("package_contract", 1);
-                }
-                if (company.getPackageEtimecard()== 1) {
-                    wrapper.or().eq("package_etimecard", 1);
-                }
-                if (company.getPackageFinance() == 1) {
-                    wrapper.or().eq("package_finance", 1);
-                }
-//            if (company.getPackageProvider() == 1) {
-//                wrapper.or().eq("package_provider", 1);
-//            }
-                if (timeType.getSyncCorpwxTime() == 1) {
-                    wrapper.or().eq("sync_corpwx_time", 1);
-                }
-                //开通财务审核功能的
-                if (timeType.getFinanceAudit() == 1) {
-                    wrapper.or().eq("finance_audit", 1);
-                }
-                return wrapper;
-            });
+            QueryWrapper<SysFunction> functionQueryWrapper = new QueryWrapper<SysFunction>().and(wrapper1->wrapper1.isNull("report_form_id").or().in("report_form_id",formIds));
             functionQueryWrapper.orderByAsc("seq");
             List<SysFunction> functionList = sysFunctionMapper.selectList(functionQueryWrapper);
             functionList = functionList.stream().filter(f->functionIdList.contains(f.getId())).collect(Collectors.toList());

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/SysFunctionMapper.xml

@@ -11,17 +11,6 @@
         <result column="module_id" property="moduleId" />
         <result column="seq" property="seq" />
         <result column="use_state" property="useState" />
-        <result column="package_time" property="packageTime" />
-        <result column="package_project" property="packageProject" />
-        <result column="package_oa" property="packageOa" />
-        <result column="package_expense" property="packageExpense" />
-        <result column="package_customer" property="packageCustomer" />
-        <result column="package_engineering" property="packageEngineering" />
-        <result column="package_contract" property="packageContract" />
-        <result column="package_etimecard" property="packageEtimecard" />
-        <result column="package_finance" property="packageFinance" />
-        <result column="sync_corpwx_time" property="syncCorpwxTime" />
-        <result column="finance_audit" property="financeAudit" />
         <result column="remarks" property="remarks" />
         <result column="report_form_id" property="reportFormId" />
     </resultMap>
@@ -36,7 +25,7 @@
     </resultMap>
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, icon, code, module_id, seq, use_state, package_time, package_project, package_oa, package_expense, package_customer, package_engineering, package_contract, package_etimecard, package_finance, sync_corpwx_time, finance_audit, remarks, report_form_id
+        id, name, icon, code, module_id, seq, use_state, remarks, report_form_id
     </sql>
     <select id="getRoleFunctions" resultMap="BaseResultMap1" >
         select sys_function.id, sys_function.name, sys_function.icon, sys_function.code, sys_function.module_id, sys_function.seq, sys_module.name as module_name

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/SysModuleMapper.xml

@@ -12,23 +12,11 @@
         <result column="orderitem" property="orderitem" />
         <result column="is_menu" property="isMenu" />
         <result column="use_state" property="useState" />
-        <result column="package_time" property="packageTime" />
-        <result column="package_project" property="packageProject" />
-        <result column="package_oa" property="packageOa" />
-        <result column="package_expense" property="packageExpense" />
-        <result column="package_customer" property="packageCustomer" />
-        <result column="package_engineering" property="packageEngineering" />
-        <result column="package_contract" property="packageContract" />
-        <result column="package_etimecard" property="packageEtimecard" />
-        <result column="report_workflow" property="reportWorkflow" />
-        <result column="package_finance" property="packageFinance" />
-        <result column="need_dept_audit" property="needDeptAudit" />
-        <result column="package_provider" property="packageProvider" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, name, path, parent_id, icon, orderitem, is_menu, use_state, package_time, package_project, package_oa, package_expense, package_customer, package_engineering, package_contract, package_etimecard, report_workflow, package_finance, need_dept_audit, package_provider
+        id, name, path, parent_id, icon, orderitem, is_menu, use_state
     </sql>
 
 </mapper>