Merge branch 'dev'
This commit is contained in:
commit
35aded9760
|
@ -324,7 +324,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
logger.error("", ex);
|
logger.error("", ex);
|
||||||
}
|
}
|
||||||
wrapper.in(deptIds.isEmpty(), "dept_id", deptIds);
|
wrapper.in(!deptIds.isEmpty(), "dept_id", deptIds);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
Loading…
Reference in New Issue