Browse Source

导入导出开发

anderx 2 years ago
parent
commit
cc8e59d816

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -131,7 +131,7 @@ xss:
   urlPatterns: /system/*,/monitor/*,/tool/*
 
 wx:
-  appId: wx4f6bec93d9863623
+  appId: wx7f6d934ed596edda
   appSecret: 89557cb97e2a716732666583ceb89c22
   #developer为开发版;trial为体验版;formal为正式版;
   state: trial

+ 3 - 1
ruoyi-system/src/main/java/com/ruoyi/project/bo/ProjectListInput.java

@@ -1,6 +1,8 @@
 package com.ruoyi.project.bo;
 
-public class ProjectListInput {
+import com.ruoyi.common.core.domain.BaseEntity;
+
+public class ProjectListInput extends BaseEntity {
     private Long uid;
     private String name;
     private String startTime;

+ 1 - 1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -303,7 +303,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         if (SecurityUtils.hashRoles(UserRolesType.CEO.getCode())){
             return SecurityUtils.getDeptId();
         }else {
-            SysDept sysDept = deptMapper.selectDeptById(SecurityUtils.getDeptId());
+            SysDept sysDept = SecurityUtils.getLoginUser().getUser().getDept();
             String[] split = sysDept.getAncestors().split(",");
             if (split.length==2)return Long.valueOf(split[1]);
             if (split.length>2)return Long.valueOf(split[2]);

+ 1 - 1
ruoyi-system/src/main/resources/mapper/project/ProjectTaskMapper.xml

@@ -212,7 +212,7 @@
     </if>
     where 1=1
     <if test="roleType ==0">
-      and (a.aid =#{uid} or  a.id in (select pid from project_staff where aid= #{uid}) b on a.id=b.pid)
+      and (a.aid =#{uid} or  a.id in (select pid from project_staff where aid= #{uid}))
     </if>
     <if test="headId !=null">
       and a.aid= #{headId}