ly 1 rok pred
rodič
commit
eb31be1b3c
19 zmenil súbory, kde vykonal 102 pridanie a 27 odobranie
  1. 0 6
      master/src/main/java/com/ruoyi/project/plant/controller/TMtdEmailController.java
  2. 11 0
      master/src/main/java/com/ruoyi/project/plant/domain/TMtActionlist.java
  3. 12 0
      master/src/main/java/com/ruoyi/project/plant/domain/TMtEhsopenitem.java
  4. 11 0
      master/src/main/java/com/ruoyi/project/plant/domain/TMtInterlock.java
  5. 10 0
      master/src/main/java/com/ruoyi/project/plant/domain/TMtKeymaintenance.java
  6. 10 1
      master/src/main/java/com/ruoyi/project/plant/domain/TMtOpextrack.java
  7. 10 0
      master/src/main/java/com/ruoyi/project/plant/domain/TMtRiskreminder.java
  8. 2 1
      master/src/main/java/com/ruoyi/project/training/controller/TTrainingrecordsController.java
  9. 5 1
      master/src/main/resources/mybatis/plant/TMtActionlistMapper.xml
  10. 5 1
      master/src/main/resources/mybatis/plant/TMtEhsopenitemMapper.xml
  11. 5 1
      master/src/main/resources/mybatis/plant/TMtInterlockMapper.xml
  12. 5 1
      master/src/main/resources/mybatis/plant/TMtKeymaintenanceMapper.xml
  13. 5 1
      master/src/main/resources/mybatis/plant/TMtMessageattentionMapper.xml
  14. 5 1
      master/src/main/resources/mybatis/plant/TMtOpextrackMapper.xml
  15. 5 4
      master/src/main/resources/mybatis/plant/TMtRiskreminderMapper.xml
  16. 0 1
      master/src/main/resources/mybatis/plant/TMtdConfigMapper.xml
  17. 1 1
      master/src/main/resources/mybatis/training/TTrainingrecordsMapper.xml
  18. 0 2
      ui/src/views/plant/dailyMeetingConfig/index.vue
  19. 0 5
      ui/src/views/plant/dailyMeetingEmail/index.vue

+ 0 - 6
master/src/main/java/com/ruoyi/project/plant/controller/TMtdEmailController.java

@@ -42,7 +42,6 @@ public class TMtdEmailController extends BaseController
     /**
      * 查询会议邮件配置列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:email:list')")
     @GetMapping("/list")
     public TableDataInfo list(TMtdEmail tMtdEmail)
     {
@@ -63,7 +62,6 @@ public class TMtdEmailController extends BaseController
     /**
      * 导出会议邮件配置列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:email:export')")
     @Log(title = "会议邮件配置", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TMtdEmail tMtdEmail)
@@ -76,7 +74,6 @@ public class TMtdEmailController extends BaseController
     /**
      * 获取会议邮件配置详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:email:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -92,7 +89,6 @@ public class TMtdEmailController extends BaseController
     /**
      * 新增会议邮件配置
      */
-    @PreAuthorize("@ss.hasPermi('plant:email:add')")
     @Log(title = "会议邮件配置", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TMtdEmail tMtdEmail)
@@ -103,7 +99,6 @@ public class TMtdEmailController extends BaseController
     /**
      * 修改会议邮件配置
      */
-    @PreAuthorize("@ss.hasPermi('plant:email:edit')")
     @Log(title = "会议邮件配置", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TMtdEmail tMtdEmail)
@@ -114,7 +109,6 @@ public class TMtdEmailController extends BaseController
     /**
      * 删除会议邮件配置
      */
-    @PreAuthorize("@ss.hasPermi('plant:email:remove')")
     @Log(title = "会议邮件配置", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

+ 11 - 0
master/src/main/java/com/ruoyi/project/plant/domain/TMtActionlist.java

@@ -84,6 +84,9 @@ public class TMtActionlist extends BaseEntity
     /** 历史记录 */
     private Long isHis;
 
+    /** 是否更新 */
+    private Long isNew;
+
     /** 指定人 */
     private String isPerson;
     /** 部门名称 */
@@ -106,6 +109,14 @@ public class TMtActionlist extends BaseEntity
         this.position = position;
     }
 
+    public Long getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Long isNew) {
+        this.isNew = isNew;
+    }
+
     public String getRespName() {
         return respName;
     }

+ 12 - 0
master/src/main/java/com/ruoyi/project/plant/domain/TMtEhsopenitem.java

@@ -65,6 +65,10 @@ public class TMtEhsopenitem extends BaseEntity
     private Long deptId;
     /** 历史记录 */
     private Long isHis;
+
+    /** 是否更新 */
+    private Long isNew;
+
     /** 会议id */
     private Long meetingId;
     /** 备注 */
@@ -74,6 +78,14 @@ public class TMtEhsopenitem extends BaseEntity
     @Excel(name = "部门名称")
     private String deptName;
 
+    public Long getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Long isNew) {
+        this.isNew = isNew;
+    }
+
     public Long getMeetingId() {
         return meetingId;
     }

+ 11 - 0
master/src/main/java/com/ruoyi/project/plant/domain/TMtInterlock.java

@@ -62,6 +62,9 @@ public class TMtInterlock extends BaseEntity
 
     /** 历史 */
     private Long isHis;
+
+    /** 是否更新 */
+    private Long isNew;
     /** 部门名称 */
     @Excel(name = "部门名称")
     private String deptName;
@@ -97,6 +100,14 @@ public class TMtInterlock extends BaseEntity
         this.maincontents = maincontents;
     }
 
+    public Long getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Long isNew) {
+        this.isNew = isNew;
+    }
+
     public String getMaincontents()
     {
         return maincontents;

+ 10 - 0
master/src/main/java/com/ruoyi/project/plant/domain/TMtKeymaintenance.java

@@ -81,6 +81,8 @@ public class TMtKeymaintenance extends BaseEntity
 
     /** 历史记录 */
     private Long isHis;
+    /** 是否更新 */
+    private Long isNew;
     /** 指定人 */
     private String isPerson;
     /** 部门名称 */
@@ -89,6 +91,14 @@ public class TMtKeymaintenance extends BaseEntity
 
     private String position;
 
+    public Long getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Long isNew) {
+        this.isNew = isNew;
+    }
+
     public String getPosition() {
         return position;
     }

+ 10 - 1
master/src/main/java/com/ruoyi/project/plant/domain/TMtOpextrack.java

@@ -68,7 +68,8 @@ public class TMtOpextrack extends BaseEntity
 
     /** 历史 */
     private Long isHis;
-
+    /** 是否更新 */
+    private Long isNew;
     /** 年度 */
     @Excel(name = "年度")
     private Long year;
@@ -81,6 +82,14 @@ public class TMtOpextrack extends BaseEntity
     @Excel(name = "部门名称")
     private String deptName;
 
+    public Long getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Long isNew) {
+        this.isNew = isNew;
+    }
+
     public String getDeptName() {
         return deptName;
     }

+ 10 - 0
master/src/main/java/com/ruoyi/project/plant/domain/TMtRiskreminder.java

@@ -70,6 +70,8 @@ public class TMtRiskreminder extends BaseEntity
 
     /** 历史 */
     private Long isHis;
+    /** 是否更新 */
+    private Long isNew;
 
     /** 部门名称 */
     @Excel(name = "部门名称")
@@ -88,6 +90,14 @@ public class TMtRiskreminder extends BaseEntity
         this.id = id;
     }
 
+    public Long getIsNew() {
+        return isNew;
+    }
+
+    public void setIsNew(Long isNew) {
+        this.isNew = isNew;
+    }
+
     public Long getId()
     {
         return id;

+ 2 - 1
master/src/main/java/com/ruoyi/project/training/controller/TTrainingrecordsController.java

@@ -87,7 +87,8 @@ public class TTrainingrecordsController extends BaseController
         if (delList.size() > 0){
             for (String id : delList
             ) {
-                tTrainingrecordsMapper.selectTTrainingrecordsBystaffId(Long.parseLong(id));
+                TTrainingrecords del = tTrainingrecordsMapper.selectTTrainingrecordsBystaffId(Long.parseLong(id));
+                tTrainingrecordsMapper.deleteTTrainingrecordsById(del.getId());
             }
         }
         List<String> addList = tTrainingrecordsMapper.queryNeedInsertIds();

+ 5 - 1
master/src/main/resources/mybatis/plant/TMtActionlistMapper.xml

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isPerson"    column="is_person"    />
         <result property="deptName" column="dept_name" />
         <result property="position" column="position" />
+        <result property="isNew" column="is_new" />
     </resultMap>
 
     <sql id="selectTMtActionlistVo">
-        select d.id, d.plant_code,d.position,d.is_person, d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_actionlist d
+        select d.id,d.is_new, d.plant_code,d.position,d.is_person, d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_actionlist d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -85,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">is_his,</if>
             <if test="isPerson != null">is_person,</if>
             <if test="position != null">position,</if>
+            <if test="isNew != null">is_new,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -105,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">#{isHis},</if>
             <if test="isPerson != null">#{isPerson},</if>
             <if test="position != null">#{position},</if>
+            <if test="isNew != null">#{isNew},</if>
          </trim>
     </insert>
 
@@ -128,6 +131,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">is_his = #{isHis},</if>
             <if test="isPerson != null">is_person = #{isPerson},</if>
             <if test="position != null">position = #{position},</if>
+            <if test="isNew != null">is_new = #{isNew},</if>
         </trim>
         where id = #{id}
     </update>

+ 5 - 1
master/src/main/resources/mybatis/plant/TMtEhsopenitemMapper.xml

@@ -22,10 +22,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="meetingId"    column="meeting_id"    />
         <result property="isHis"    column="is_his"    />
         <result property="deptName" column="dept_name" />
+        <result property="isNew" column="is_new" />
     </resultMap>
 
     <sql id="selectTMtEhsopenitemVo">
-        select d.id, d.plant_code, d.category, d.notopen, d.closed, d.expired, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks , d.meeting_id, d.is_his ,s.dept_name from t_mt_ehsopenitem d
+        select d.id,d.is_new, d.plant_code, d.category, d.notopen, d.closed, d.expired, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks , d.meeting_id, d.is_his ,s.dept_name from t_mt_ehsopenitem d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -71,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
             <if test="meetingId != null">meeting_id,</if>
             <if test="isHis != null">is_his,</if>
+            <if test="isNew != null">is_new,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -89,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">#{remarks},</if>
             <if test="meetingId != null">#{meetingId},</if>
             <if test="isHis != null">#{isHis},</if>
+            <if test="isNew != null">#{isNew},</if>
          </trim>
     </insert>
 
@@ -110,6 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="meetingId != null">meeting_id = #{meetingId},</if>
             <if test="isHis != null">is_his = #{isHis},</if>
+            <if test="isNew != null">is_new = #{isNew},</if>
         </trim>
         where id = #{id}
     </update>

+ 5 - 1
master/src/main/resources/mybatis/plant/TMtInterlockMapper.xml

@@ -19,10 +19,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="meetingId"    column="meeting_id"    />
         <result property="isHis"    column="is_his"    />
         <result property="deptName" column="dept_name" />
+        <result property="isNew" column="is_new" />
     </resultMap>
 
     <sql id="selectTMtInterlockVo">
-        select d.id, d.plant_code, d.maincontents, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_interlock d
+        select d.id,d.is_new, d.plant_code, d.maincontents, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_interlock d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -61,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks,</if>
             <if test="meetingId != null">meeting_id,</if>
             <if test="isHis != null">is_his,</if>
+            <if test="isNew != null">is_new,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -76,6 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">#{remarks},</if>
             <if test="meetingId != null">#{meetingId},</if>
             <if test="isHis != null">#{isHis},</if>
+            <if test="isNew != null">#{isNew},</if>
          </trim>
     </insert>
 
@@ -94,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="remarks != null">remarks = #{remarks},</if>
             <if test="meetingId != null">meeting_id = #{meetingId},</if>
             <if test="isHis != null">is_his = #{isHis},</if>
+            <if test="isNew != null">is_new = #{isNew},</if>
         </trim>
         where id = #{id}
     </update>

+ 5 - 1
master/src/main/resources/mybatis/plant/TMtKeymaintenanceMapper.xml

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="isPerson"    column="is_person"    />
         <result property="position" column="position" />
+        <result property="isNew" column="is_new" />
     </resultMap>
 
     <sql id="selectTMtKeymaintenanceVo">
-        select d.id, d.plant_code,d.position, d.is_person,d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_keymaintenance d
+        select d.id,d.is_new, d.plant_code,d.position, d.is_person,d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_keymaintenance d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -75,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">is_his,</if>
             <if test="isPerson != null">is_person,</if>
             <if test="position != null">position,</if>
+            <if test="isNew != null">is_new,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -95,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">#{isHis},</if>
             <if test="isPerson != null">#{isPerson},</if>
             <if test="position != null">#{position},</if>
+            <if test="isNew != null">#{isNew},</if>
          </trim>
     </insert>
 
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">is_his = #{isHis},</if>
             <if test="isPerson != null">is_person = #{isPerson},</if>
             <if test="position != null">position = #{position},</if>
+            <if test="isNew != null">is_new = #{isNew},</if>
         </trim>
         where id = #{id}
     </update>

+ 5 - 1
master/src/main/resources/mybatis/plant/TMtMessageattentionMapper.xml

@@ -24,10 +24,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptName" column="dept_name" />
         <result property="isPerson"    column="is_person"    />
         <result property="position" column="position" />
+        <result property="isNew" column="is_new" />
     </resultMap>
 
     <sql id="selectTMtMessageattentionVo">
-        select d.id, d.plant_code,d.position, d.is_person,d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_mt_messageattention d
+        select d.id,d.is_new, d.plant_code,d.position, d.is_person,d.responsible, d.action, d.deadline, d.status, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks ,s.dept_name from t_mt_messageattention d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -75,6 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">is_his,</if>
             <if test="isPerson != null">is_person,</if>
             <if test="position != null">position,</if>
+            <if test="isNew != null">is_new,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -95,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">#{isHis},</if>
             <if test="isPerson != null">#{isPerson},</if>
             <if test="position != null">#{position},</if>
+            <if test="isNew != null">#{isNew},</if>
          </trim>
     </insert>
 
@@ -118,6 +121,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">is_his = #{isHis},</if>
             <if test="isPerson != null">is_person = #{isPerson},</if>
             <if test="position != null">position = #{position},</if>
+            <if test="isNew != null">is_new = #{isNew},</if>
         </trim>
         where id = #{id}
     </update>

+ 5 - 1
master/src/main/resources/mybatis/plant/TMtOpextrackMapper.xml

@@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="year"    column="year"    />
         <result property="benefit"    column="benefit"    />
         <result property="deptName" column="dept_name" />
+        <result property="isNew" column="is_new" />
     </resultMap>
 
     <sql id="selectTMtOpextrackVo">
-        select d.id, d.plant_code, d.ongoing, d.finished, d.totalitem, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his, d.year, d.benefit ,s.dept_name from t_mt_opextrack d
+        select d.id,d.is_new, d.plant_code, d.ongoing, d.finished, d.totalitem, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his, d.year, d.benefit ,s.dept_name from t_mt_opextrack d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -71,6 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">is_his,</if>
             <if test="year != null">year,</if>
             <if test="benefit != null">benefit,</if>
+            <if test="isNew != null">is_new,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -90,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">#{isHis},</if>
             <if test="year != null">#{year},</if>
             <if test="benefit != null">#{benefit},</if>
+            <if test="isNew != null">#{isNew},</if>
          </trim>
     </insert>
 
@@ -112,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isHis != null">is_his = #{isHis},</if>
             <if test="year != null">year = #{year},</if>
             <if test="benefit != null">benefit = #{benefit},</if>
+            <if test="isNew != null">is_new = #{isNew},</if>
         </trim>
         where id = #{id}
     </update>

+ 5 - 4
master/src/main/resources/mybatis/plant/TMtRiskreminderMapper.xml

@@ -21,11 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isHis"    column="is_his"    />
         <result property="deptName" column="dept_name" />
         <result property="assessment" column="assessment" />
-
+        <result property="isNew" column="is_new" />
     </resultMap>
 
     <sql id="selectTMtRiskreminderVo">
-        select d.id, d.plant_code,d.assessment, d.maincontents, d.risk, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_riskreminder d
+        select d.id,d.is_new, d.plant_code,d.assessment, d.maincontents, d.risk, d.inputdate, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.meeting_id, d.is_his ,s.dept_name from t_mt_riskreminder d
       left join sys_dept s on s.dept_id = d.dept_id
     </sql>
 
@@ -68,6 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="meetingId != null">meeting_id,</if>
             <if test="isHis != null">is_his,</if>
             <if test="assessment != null">assessment,</if>
+            <if test="isNew != null">is_new,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -85,7 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="meetingId != null">#{meetingId},</if>
             <if test="isHis != null">#{isHis},</if>
             <if test="assessment != null">#{assessment},</if>
-
+            <if test="isNew != null">#{isNew},</if>
          </trim>
     </insert>
 
@@ -106,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="meetingId != null">meeting_id = #{meetingId},</if>
             <if test="isHis != null">is_his = #{isHis},</if>
             <if test="assessment != null">assessment = #{assessment},</if>
-
+            <if test="isNew != null">is_new = #{isNew},</if>
         </trim>
         where id = #{id}
     </update>

+ 0 - 1
master/src/main/resources/mybatis/plant/TMtdConfigMapper.xml

@@ -30,7 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and d.del_flag = 0
         </where>
         <!-- 数据范围过滤 -->
-        ${params.dataScope}
     </select>
 
     <select id="selectTMtdConfigById" parameterType="Long" resultMap="TMtdConfigResult">

+ 1 - 1
master/src/main/resources/mybatis/training/TTrainingrecordsMapper.xml

@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectTTrainingrecordsBystaffId" parameterType="Long" resultMap="TTrainingrecordsResult">
         <include refid="selectTTrainingrecordsVo"/>
-        where d.staff_id = #{id}
+        where d.staff_id = #{id} and rownum <![CDATA[ <= ]]> 1
     </select>
 
     <insert id="insertTTrainingrecords" parameterType="TTrainingrecords">

+ 0 - 2
ui/src/views/plant/dailyMeetingConfig/index.vue

@@ -43,7 +43,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:dailyMeetingConfig:edit']"
         >修改</el-button>
       </el-col>
 
@@ -63,7 +62,6 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:dailyMeetingConfig:edit']"
           >修改</el-button>
 
         </template>

+ 0 - 5
ui/src/views/plant/dailyMeetingEmail/index.vue

@@ -22,7 +22,6 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['plant:email:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -32,7 +31,6 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['plant:email:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -42,7 +40,6 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['plant:email:remove']"
         >删除</el-button>
       </el-col>
 
@@ -65,14 +62,12 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['plant:email:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['plant:email:remove']"
           >删除</el-button>
         </template>
       </el-table-column>