|
|
@@ -96,7 +96,7 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
|
|
|
List<String>ls= JSON.parseArray(deps,String.class);
|
|
|
List<String> myAll=new ArrayList<>();
|
|
|
List<String> my=selectMyDeps();
|
|
|
- if (!my.isEmpty()){
|
|
|
+ if (!ls.isEmpty()&&!my.isEmpty()){
|
|
|
for (String dep : ls) {
|
|
|
for (String dep2 : my) {
|
|
|
if (dep.equals(dep2))myAll.add(dep);
|