修改处理报警接口

李宇

2021-01-21 9c9503de4fb1e1b0127f83c8b2b0f645c6ab9e9c

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

@@ -7,8 +7,10 @@
import com.nanometer.smartlab.entity.enumtype.ApproverFlag;
import com.nanometer.smartlab.entity.enumtype.SeeFlag;
import com.nanometer.smartlab.entity.enumtype.ValidFlag;
import com.nanometer.smartlab.entity.enumtype.Waster;
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 +52,8 @@
    private BaseMetaService baseMetaService;
    @Resource
    private BaseRoleService baseRoleService;
    @Resource
    private SysProjectService sysProjectService;

    private LazyDataModel<SysUser> dataModel;
    private SysUser sysUser;
@@ -66,6 +70,7 @@
    private String editPasswor;
    private List<BaseMeta> codeList;
    private List<BaseRole> roleList;
    private List<Waster> wasterSelectList;

    public List<BaseRole> getRoleList() {
        return roleList;
@@ -233,10 +238,20 @@
                if(valuesList.get(12).equals(SeeFlag.LEADING.getText())){
                    sysUser.setSeeFlag(SeeFlag.LEADING);
                }
                if(valuesList.size()==14){
                    sysUser.setMemo(valuesList.get(13));
                }else {
                    sysUser.setMemo("");


                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.setProject(null);
                }

                sysUser.setValidFlag(ValidFlag.VALID);
@@ -539,6 +554,14 @@
       return seeFlagSelectList;
    }

    public List<Waster> getWasterSelectList() {
        if (this.wasterSelectList == null) {
            this.wasterSelectList = Arrays.asList(Waster.values());
        }

        return wasterSelectList;
    }

    public String getArp() {
        return arp;
    }