|
@@ -316,9 +316,9 @@ public class ScreenComponent {
|
|
*/
|
|
*/
|
|
public List<WorkshopAccount> workshopAccountList(int type, Date date, Dept dept) {
|
|
public List<WorkshopAccount> workshopAccountList(int type, Date date, Dept dept) {
|
|
LambdaQueryWrapper<WorkshopAccount> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<WorkshopAccount> queryWrapper = new LambdaQueryWrapper<>();
|
|
- queryWrapper.eq(WorkshopAccount::getDept, dept.getName());
|
|
|
|
queryWrapper.eq(WorkshopAccount::getRedFlashFlag, 1);
|
|
queryWrapper.eq(WorkshopAccount::getRedFlashFlag, 1);
|
|
if (type == 1) {
|
|
if (type == 1) {
|
|
|
|
+ queryWrapper.eq(WorkshopAccount::getDeptId, dept.getId());
|
|
queryWrapper.eq(WorkshopAccount::getLocTo, 1);
|
|
queryWrapper.eq(WorkshopAccount::getLocTo, 1);
|
|
} else {
|
|
} else {
|
|
queryWrapper.eq(WorkshopAccount::getLocFrom, 1);
|
|
queryWrapper.eq(WorkshopAccount::getLocFrom, 1);
|