修改:idCard改成8位输入或者20位输入,转换大写 原因：扫码扫出8位，数据库和柜子使用的是20位 提出：秦老师

gdg

2020-12-30 e21830598f6c55f1196c519fd9005704c82a0fb3

修改:idCard改成8位输入或者20位输入,转换大写
原因：扫码扫出8位，数据库和柜子使用的是20位
提出：秦老师

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

@@ -196,9 +196,24 @@

                sysUser.setPassword(MD5Utils.encode((int)Double.parseDouble(valuesList.get(5))+""));//密码

                //valuesList.get(8) id卡号检查
                if (valuesList.get(8) != null && valuesList.get(8).length()>0){
                    //大写转换
                    String idCardUpper = valuesList.get(8).trim().toUpperCase();
                    //8位和20位下8位才做补齐20位，否则提示输入id卡号8位或者20位
                    if (idCardUpper.length() == 8 ||idCardUpper.length() == 20) {
                        if (idCardUpper.length() == 8){
                            //8位补齐20位，否则不做操作
                            String idCard = "E0E01E000A" + idCardUpper + "01";
                            sysUser.setIdCard(idCard);//id卡号
                        }
                    }else{
                        FacesUtils.warn("第"+i+"行,id卡号需要8位或者20位");
                        return;
                    }
                }
                sysUser.setPhone(valuesList.get(6));//电话
                sysUser.setEmail(valuesList.get(7));//邮箱
                sysUser.setIdCard(valuesList.get(8));//id卡号
                sysUser.setPoint((int)Double.parseDouble(valuesList.get(9)));//分数
                sysUser.setRoleId(valuesList.get(10));//角色
                if(valuesList.get(11).equals("是")){
@@ -336,6 +351,24 @@
                }

                // 检查idCard
                if (this.sysUser.getIdCard() != null && this.sysUser.getIdCard().length()>0){
                    String idCardUpper = sysUser.getIdCard().trim().toUpperCase();
                    //8位和20位下8位才做补齐20位，否则提示输入id卡号8位或者20位
                    if (idCardUpper.length() == 8 ||idCardUpper.length() == 20) {
                        if (idCardUpper.length() == 8){
                            //8位补齐20位，否则不做操作
                            this.sysUser.setIdCard("E0E01E000A" + idCardUpper + "01");
                        }else{
                            //20位
                            this.sysUser.setIdCard(idCardUpper);
                        }
                    }else{
                        FacesUtils.warn("id卡号8位或者20位");
                        return;
                    }
                }


                if (!StringUtils.isEmpty(this.sysUser.getIdCard()) && this.sysUserService.isSysUserExist(null, null, this.sysUser.getIdCard(), null)) {
                    FacesUtils.warn("ID卡号已存在。");
                    return;
@@ -375,6 +408,23 @@
                }

                // 检查idCard
                if (this.sysUser.getIdCard() != null && this.sysUser.getIdCard().length()>0){
                    String idCardUpper = sysUser.getIdCard().trim().toUpperCase();
                    //8位和20位下8位才做补齐20位，否则提示输入id卡号8位或者20位
                    if (idCardUpper.length() == 8 ||idCardUpper.length() == 20) {
                        if (idCardUpper.length() == 8){
                            //8位补齐20位，否则不做操作
                            this.sysUser.setIdCard("E0E01E000A" + idCardUpper + "01");
                        }else{
                            //20位
                            this.sysUser.setIdCard(idCardUpper);
                        }
                    }else{
                        FacesUtils.warn("id卡号8位或者20位");
                        return;
                    }
                }

                if(this.sysUser.getIdCard()==null || this.sysUser.getIdCard()==""){

                }else {