|
@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.validation.Valid;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
|
|
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|
@@ -108,11 +109,14 @@ public class DeptController {
|
|
|
List<String> userAchievements =null;
|
|
|
for (AdminUserDO ad :allUser){
|
|
|
if (ad.getUserType().equals("1") || ad.getUserType().equals("2")){
|
|
|
+ student = new ArrayList<>();
|
|
|
student.add(ad);
|
|
|
}
|
|
|
else if (ad.getUserType().equals("3")){
|
|
|
+ supervisor = new ArrayList<>();
|
|
|
supervisor.add(ad);
|
|
|
}
|
|
|
+ userAchievements = new ArrayList<>();
|
|
|
userAchievements.add(userAchievementService.getUserAchievement(Math.toIntExact(ad.getId())).getDetail());
|
|
|
}
|
|
|
newDept.setSupervisorNum(String.valueOf(supervisor.stream().count()));
|