Merge branch 'master' into docker_package

Merge branch 'dev'
...
2022-12-16 14:56:14 +08:00 · 2022-12-16 14:56:08 +08:00 · 2022-12-16 14:56:00 +08:00
1 changed files with 1 additions and 1 deletions
--- a/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
+++ b/renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
@ -324,7 +324,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
                    } catch (Exception ex) {
                        logger.error("", ex);
                    }
-                    wrapper.in(deptIds.isEmpty(), "dept_id", deptIds);
+                    wrapper.in(!deptIds.isEmpty(), "dept_id", deptIds);
                }
                break;
                default:
Author	SHA1	Message	Date
wangliwen	e067637d45	Merge branch 'master' into docker_package	2022-12-16 14:56:14 +08:00
wangliwen	35aded9760	Merge branch 'dev'	2022-12-16 14:56:08 +08:00
wangliwen	2e5677486a	...	2022-12-16 14:56:00 +08:00