完善机构扩展信息,修改作息

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysOrgExtendController.java

@@ -76,7 +76,7 @@ public class SysOrgExtendController extends BaseController {
     @Log(title = "机构扩展", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody SysOrgExtend sysOrgExtend) {
-        return toAjax(sysOrgExtendService.insertSysOrgExtend(sysOrgExtend));
+        return success(sysOrgExtendService.insertSysOrgExtend(sysOrgExtend));
     }
 
     /**

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysWorkTimeController.java

@@ -106,7 +106,7 @@ public class SysWorkTimeController extends BaseController {
     @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
     @PostMapping("/saveOneWorkTime")
     public AjaxResult edit(@RequestBody SysWorkTime sysWorkTime) {
-        return toAjax(sysWorkTimeService.updateSysWorkTime(sysWorkTime));
+        return success(sysWorkTimeService.updateSysWorkTime(sysWorkTime));
     }
 
     /**
@@ -129,6 +129,6 @@ public class SysWorkTimeController extends BaseController {
             map = sysWorkTimeService.checkData(sysWorkTime);
         }
         //目前只取数据条数，不取数据，看后续有没有需求在页面展示数据
-        return AjaxResult.success(null, map);
+        return AjaxResult.success( map);
     }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/mapper/SysWorkTimeSetMapper.java

@@ -31,7 +31,7 @@ public interface SysWorkTimeSetMapper extends BaseMapper<SysWorkTimeSet> {
     @MapKey("id")
     public IPage<SysWorkTimeSet> selectByPage(Page<SysWorkTimeSet> page,SysWorkTimeSet sysWorkTimeSet );
 
-    List<SysWorkTimeSet> findWorkTimeForOrgIdsAndErrectiveDate(List<Long> orgIds, Date effectiveDate);
+    List<SysWorkTimeSet> findWorkTimeForOrgIdsAndErrectiveDate(@Param("orgIds") List<Long> orgIds, @Param("effectiveDate")Date effectiveDate);
     int checkData(@Param("request") SysWorkTimeSet request);
     /**
      * 查询作息设置列表

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysWorkTimeSetMapper.xml

@@ -119,8 +119,8 @@ select  * from sys_work_time_set
     <select id="findWorkTimeForOrgIdsAndErrectiveDate" resultType="com.xunmei.system.domain.SysWorkTimeSet">
 
         select s.* from sys_work_time_set s where s.org_id in
-        <foreach item="orgIds" collection="list" open="(" separator="," close=")">
-            #{orgIds}
+        <foreach item="orgId" collection="orgIds" open="(" separator="," close=")">
+            #{orgId}
         </foreach>
          and s.effective_date = #{effectiveDate} and s.deleted = false