|
|
@@ -1,7 +1,9 @@
|
|
|
package com.zd.system.controller;
|
|
|
|
|
|
+import cn.hutool.core.collection.CollectionUtil;
|
|
|
import cn.hutool.core.util.RandomUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
+import com.alibaba.fastjson.JSON;
|
|
|
import com.zd.base.api.feign.RemoteFileService;
|
|
|
import com.zd.chemical.api.fegin.RemoteStockService;
|
|
|
import com.zd.common.core.annotation.DataScope;
|
|
|
@@ -131,7 +133,11 @@ public class SysUserController extends BaseController {
|
|
|
public TableDataInfo getUserDutyList(SysUser user) {
|
|
|
startPage();
|
|
|
List<SysUser> list ;
|
|
|
- user.setMajorId(Long.valueOf(user.getSubjectIds().size()+"") );
|
|
|
+ logger.info("getUserDutyList starting....,param:{}", JSON.toJSONString(user));
|
|
|
+ if(CollectionUtil.isEmpty(user.getSubjectIds())){
|
|
|
+ throw new ServiceException("实验室集合不能为空!");
|
|
|
+ }
|
|
|
+ user.setMajorId( Long.valueOf(user.getSubjectIds().size()+""));
|
|
|
if(user.getSubjectIds().size()==1){
|
|
|
list = userService.selectUserDutyList(user);
|
|
|
}else {
|