模块：用户管理 修改：导入新增课题组,修改导入时插入的代码问题 提出：秦老师

gdg

2021-01-12 4ad8653be79cb07fc7f450540ea20d82b3971b89

模块：用户管理
修改：导入新增课题组,修改导入时插入的代码问题
提出：秦老师

 src/main/java/com/nanometer/smartlab/controller/UserMngController.java

@@ -9,6 +9,7 @@
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.service.BaseMetaService;
import com.nanometer.smartlab.service.BaseRoleService;
import com.nanometer.smartlab.service.SysProjectService;
import com.nanometer.smartlab.service.SysUserService;
import com.nanometer.smartlab.util.Constants;
import com.nanometer.smartlab.util.FacesUtils;
@@ -50,6 +51,8 @@
    private BaseMetaService baseMetaService;
    @Resource
    private BaseRoleService baseRoleService;
    @Resource
    private SysProjectService sysProjectService;

    private LazyDataModel<SysUser> dataModel;
    private SysUser sysUser;
@@ -233,10 +236,20 @@
                if(valuesList.get(12).equals(SeeFlag.LEADING.getText())){
                    sysUser.setSeeFlag(SeeFlag.LEADING);
                }
                if(valuesList.size()==14){
                    sysUser.setMemo(valuesList.get(13));


                if (valuesList.size() > 13 && !valuesList.get(13).replace(" ","").isEmpty()){
                    String[] projects = valuesList.get(13).split(",");
                    for (String project : projects) {
                        //不存再就直接推出
                        if (!sysProjectService.isExistProject(project)) {
                            throw new Exception("课题组不存在,（" + i  + "行）");
                        }
                    }
                    //都存在就设置
                    sysUser.setProject(valuesList.get(13).replace(" ",""));
                }else {
                    sysUser.setMemo("");
                    sysUser.setProject(null);
                }

                sysUser.setValidFlag(ValidFlag.VALID);

 src/main/java/com/nanometer/smartlab/service/SysUserServiceImpl.java

@@ -283,9 +283,9 @@
            if (userList.size()>0) {
                for (SysUser user:userList) {
                    if (this.isSysUserExist(user.getArp(), null, null, null)) {

                        throw new DuplicateKeyException("arp重复");
                    }else if(!com.alibaba.druid.util.StringUtils.isEmpty(user.getIdCard()) && this.isSysUserExist(null, null, user.getIdCard(), null)){

                        throw new DuplicateKeyException("idCard为空或重复");
                    }else {
                        SysUser sysUser=sysUserDao.selectByAccount(user);
                        if(sysUser==null){

 src/main/webapp/resources/template/用户导入模板.xlsx

Binary files differ