|
@@ -592,6 +592,9 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
|
|
if (timeType.getNeedDeptAudit() == 1) {
|
|
if (timeType.getNeedDeptAudit() == 1) {
|
|
queryWrapper.or().eq("need_dept_audit", 1);
|
|
queryWrapper.or().eq("need_dept_audit", 1);
|
|
}
|
|
}
|
|
|
|
+ if (company.getPackageDevice() == 1) {
|
|
|
|
+ queryWrapper.or().eq("package_device", 1);
|
|
|
|
+ }
|
|
|
|
|
|
queryWrapper.orderByAsc("orderitem");
|
|
queryWrapper.orderByAsc("orderitem");
|
|
|
|
|