LY 培训

master/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/data/ruoyi/logs" />
+	<property name="log.path" value="/u03/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

master/src/main/resources/mybatis/training/spec/TStYearplanMapper.xml

@@ -23,8 +23,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectTStYearplanVo">
         select d.id, d.staff_id,u.nick_name, d.name,d.plan_year, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.approve_status ,s.dept_name from t_st_yearplan d
-      left join sys_dept s on s.dept_id = d.dept_id
-      left join sys_user u on d.staff_id = u.staffid
+      left join sys_dept s on s.dept_id = d.dept_id and s.del_flag = 0
+      left join sys_user u on d.staff_id = u.staffid and u.del_flag = 0
       left join T_ST_SUCCESSOR suc on d.STAFF_ID = suc.STAFF_ID and suc.del_flag = 0
     </sql>
 

ui/src/views/plant/organization/index.vue

@@ -251,7 +251,7 @@ export default {
               bz8: false
             }
             if (this.staffmgrList[i].specialDuty) {
-              console.log(this.staffmgrList[i].specialDuty)
+              // console.log(this.staffmgrList[i].specialDuty)
               let dutyArr = this.staffmgrList[i].specialDuty.split(",")
               for (let i = 0; i < dutyArr.length; i++) {
                 if (dutyArr[i] == "10") {
@@ -292,7 +292,7 @@ export default {
               bz8: false
             }
             if (this.staffmgrList[i].specialDuty) {
-              console.log(this.staffmgrList[i].specialDuty)
+              // console.log(this.staffmgrList[i].specialDuty)
               let dutyArr = this.staffmgrList[i].specialDuty.split(",")
               for (let i = 0; i < dutyArr.length; i++) {
                 if (dutyArr[i] == "10") {
@@ -319,7 +319,7 @@ export default {
         }
 
         this.list1 = this.listToTree(this.list2)
-        console.log(JSON.stringify(this.list1))
+        // console.log(JSON.stringify(this.list1))
       })
     },
     listToTree(list) {