调整机构

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysWorkTimeSetServiceImpl.java

@@ -56,6 +56,7 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
     private SysWorkTimeMapper sysWorkTimeMapper;
     @Autowired
     private ISysWorkTimeService workTimeService;
+
     @Override
     public TableDataInfo<SysWorkTimeSet> selectPage(SysWorkTimeSet sysWorkTimeSet) {
         //未删除
@@ -465,7 +466,8 @@ public class SysWorkTimeSetServiceImpl extends ServiceImpl<SysWorkTimeSetMapper,
             s.setYmdQuarter(Long.valueOf(s.getYmd().getQuarter()));
             s.setYmdWeek(Long.valueOf(s.getYmd().getWeek()));
             s.setYmdYear(Long.valueOf(s.getYmd().getYear()));
-        }        workTimeService.saveBatch(list1);
+        }
+        workTimeService.saveOrUpdateBatch(list1);
 
         return workTimeList;
     }

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

@@ -611,6 +611,9 @@
         <if test="  org.isLock != null">
             and o.is_lock =#{org.isLock}
         </if>
+        <if test="  org.type != null and org.type !=''">
+            and o.type =#{org.type}
+        </if>
         <if test="  org.name != null and org.name !=''">
             and o.name like concat(concat('%',#{org.name}),'%')
         </if>