LY smes

master/src/main/java/com/ruoyi/project/plant/controller/TBrithstaffmgrController.java

@@ -36,7 +36,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 查询生日提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:list')")
     @GetMapping("/list")
     public TableDataInfo list(TBrithstaffmgr tBrithstaffmgr)
     {
@@ -48,7 +47,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 导出生日提醒列表
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:export')")
     @Log(title = "生日提醒", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TBrithstaffmgr tBrithstaffmgr)
@@ -61,7 +59,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 获取生日提醒详细信息
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,7 +68,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 新增生日提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:add')")
     @Log(title = "生日提醒", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody TBrithstaffmgr tBrithstaffmgr)
@@ -82,7 +78,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 修改生日提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:edit')")
     @Log(title = "生日提醒", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody TBrithstaffmgr tBrithstaffmgr)
@@ -93,7 +88,6 @@ public class TBrithstaffmgrController extends BaseController
     /**
      * 删除生日提醒
      */
-    @PreAuthorize("@ss.hasPermi('plant:brithstaffmgr:remove')")
     @Log(title = "生日提醒", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

master/src/main/java/com/ruoyi/project/training/spec/domain/vo/TStFeedbackVO.java

@@ -6,7 +6,6 @@ import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.framework.web.domain.BaseEntity;
 import com.ruoyi.project.training.spec.domain.TStPlan;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

master/src/main/resources/mybatis/sems/TSpecdevCcMapper.xml

@@ -353,7 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE  T_SPECDEV_CC set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_CC b
-        where b.REGNO = T_SPECDEV_CC.REGNO and T_SPECDEV_CC.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.REGNO = T_SPECDEV_CC.REGNO and b.PLANT_CODE = T_SPECDEV_CC.PLANT_CODE  and T_SPECDEV_CC.DEL_FLAG = 0 and b.DEL_FLAG = 0
         and T_SPECDEV_CC.APPROVE_STATUS = 0
         )
     </update>

master/src/main/resources/mybatis/sems/TSpecdevDtMapper.xml

@@ -311,7 +311,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE  T_SPECDEV_DT set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_DT b
-        where b.REGNO = T_SPECDEV_DT.REGNO and T_SPECDEV_DT.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.REGNO = T_SPECDEV_DT.REGNO and b.PLANT_CODE = T_SPECDEV_DT.PLANT_CODE and T_SPECDEV_DT.DEL_FLAG = 0 and b.DEL_FLAG = 0
         and T_SPECDEV_DT.APPROVE_STATUS = 0
         )
     </update>

master/src/main/resources/mybatis/sems/TSpecdevDzsbMapper.xml

@@ -302,7 +302,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE  T_SPECDEV_DZSB set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_DZSB b
-        where b.DEVNO = T_SPECDEV_DZSB.DEVNO and T_SPECDEV_DZSB.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.DEVNO = T_SPECDEV_DZSB.DEVNO and b.PLANT_CODE = T_SPECDEV_DZSB.PLANT_CODE and T_SPECDEV_DZSB.DEL_FLAG = 0 and b.DEL_FLAG = 0
         and T_SPECDEV_DZSB.APPROVE_STATUS = 0
         )
     </update>

master/src/main/resources/mybatis/sems/TSpecdevGlMapper.xml

@@ -334,7 +334,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UPDATE  T_SPECDEV_GL set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_GL b
-        where b.DEVNO = T_SPECDEV_GL.DEVNO and T_SPECDEV_GL.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.DEVNO = T_SPECDEV_GL.DEVNO and b.plant_code = T_SPECDEV_GL.plant_code and T_SPECDEV_GL.DEL_FLAG = 0 and b.DEL_FLAG = 0
             and T_SPECDEV_GL.APPROVE_STATUS = 0
         )
     </update>

master/src/main/resources/mybatis/sems/TSpecdevYlgdMapper.xml

@@ -470,7 +470,7 @@
         UPDATE  T_SPECDEV_YLGD set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_YLGD b
-        where b.DEVNO = T_SPECDEV_YLGD.DEVNO and T_SPECDEV_YLGD.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.DEVNO = T_SPECDEV_YLGD.DEVNO and b.plant_code = T_SPECDEV_YLGD.plant_code and T_SPECDEV_YLGD.DEL_FLAG = 0 and b.DEL_FLAG = 0
             and T_SPECDEV_YLGD.APPROVE_STATUS = 0
         )
     </update>

master/src/main/resources/mybatis/sems/TSpecdevYlrqMapper.xml

@@ -398,7 +398,7 @@
         UPDATE  T_SPECDEV_YLRQ set DEL_FLAG = 2
         where rowid !=( select max(rowid)
         from T_SPECDEV_YLRQ b
-        where b.DEVNO = T_SPECDEV_YLRQ.DEVNO and T_SPECDEV_YLRQ.DEL_FLAG = 0 and b.DEL_FLAG = 0
+        where b.DEVNO = T_SPECDEV_YLRQ.DEVNO and b.plant_code = T_SPECDEV_YLRQ.plant_code and T_SPECDEV_YLRQ.DEL_FLAG = 0 and b.DEL_FLAG = 0
         and T_SPECDEV_YLRQ.APPROVE_STATUS = 0
         )
     </update>