组织架构考勤规则修改二次提交

bonus-modules/bonus-system/src/main/java/com/bonus/system/att/controller/OrgChangeController.java

@@ -59,6 +59,7 @@ public class OrgChangeController extends BaseController {
         try{
             startPage();
             //不查撤回的
+            bean.setIsCheck("-1");
             return getDataTable(orgChangeService.selectOrgChangeList(bean));
         }catch (Exception e){
             log.error(e.toString(),e);

bonus-modules/bonus-system/src/main/java/com/bonus/system/basic/controller/SysUserController.java

@@ -188,6 +188,7 @@ public class SysUserController extends BaseController {
             List<MapVo> orgList = userService.getOrgByUserId(user);
             user.setOrgList(orgList);
             // 获取考勤组
+
             List<MapVo> attGroupList = userService.getAttGroupByUserId(user);
             if(!attGroupList.isEmpty()){
                 user.setAttGroupId(attGroupList.get(0).getId());

bonus-modules/bonus-system/src/main/resources/mapper/att/OrgChangeMapper.xml

@@ -27,7 +27,12 @@
             and oc.create_time between #{startTime} and #{endTime}
         </if>
         <if test="isCheck != null and isCheck != '' ">
-            and oc.is_check = #{isCheck}
+          <if test="isCheck == '-1'">
+            and oc.is_check in (0,1,2)
+          </if>
+            <if test="isCheck != '-1'">
+                and oc.is_check = #{isCheck}
+            </if>
         </if>
         group by oc.is_check ASC
     </select>