czh 2 лет назад
Родитель
Сommit
913a4ea1d8

+ 1 - 1
sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsDeptController.java

@@ -29,7 +29,7 @@ public class KwsDeptController {
      * @date 2023/5/30
      **/
     @GetMapping("/detail")
-    public HttpResult selectByKey(Long id) throws SystemException {
+    public HttpResult selectByKey(@RequestParam Long id) throws SystemException {
         KwsDept sysDict = kwsDeptService.selectByKey(id);
         return HttpResult.ok(sysDict);
     }

+ 1 - 0
sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -519,6 +519,7 @@ public class KwsEnterpriseService {
      * @author: czh
      * @date: 2023/6/19
      */
+    @Transactional(rollbackFor = {})
     public void addEntSettle(AddEntSettleReqVo reqVo) throws SystemException {
         /*1、存用户信息*/
         RegisterReqDto registerReqDto = new RegisterReqDto();

+ 2 - 2
sckw-modules/sckw-system/src/main/resources/mapper/KwsRoleDao.xml

@@ -140,10 +140,10 @@
       and sr.deptId = #{deptId, jdbcType=VARCHAR}
     </if>
     <if test="startTime != null and startTime != ''">
-      and sr.create_time >= #{startTime}
+      and sr.create_time >= #{startTime,jdbcType=DATE}
     </if>
     <if test="endTime != null and endTime != ''" >
-      and sr.create_time &lt;= #{startTime}
+      and sr.create_time &lt;= #{endTime,jdbcType=DATE}
     </if>
 
     ORDER BY sr.create_time desc