Commit 3af8152e by 陈浩建

修复新用户审核模块bug

parent d00ee999
......@@ -750,6 +750,7 @@ public class LoginPwdController extends BaseController {
hhrUser.setStudentImgUrl(PicturesUtil.uploadPictures(stuCard, sysUser.getId(), PATHTYPE));
hhrUser.setGrade(classZ);
hhrUser.setUploadState(1);
hhrUser.setFxs("");
insert += hhrUserMapper.insert(hhrUser);
if (insert == 3) {
return ResponseData.success("账号创建成功,待管理员审核!");
......
......@@ -210,7 +210,7 @@ public class NewUserController extends BaseController {
}
for (SysUser sysUser : sysUserList) {
if(sysUser.getId().equals(id)){
objectMap.put("name",sysUser.getPhone());
objectMap.put("name",sysUser.getName());
objectMap.put("phone",sysUser.getPhone());
objectMap.put("sex",sysUser.getSex());
objectMap.put("status",sysUser.getStatus());
......
......@@ -8,10 +8,8 @@ import com.winsun.auth.core.base.controller.BaseController;
import com.winsun.auth.core.common.model.ResponseData;
import com.winsun.bean.Package;
import com.winsun.bean.PackageUpgrade;
import com.winsun.bean.Teacher;
import com.winsun.mapper.PackageMapper;
import com.winsun.mapper.PackageUpgradeMapper;
import com.winsun.mapper.TeacherMapper;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
......
......@@ -195,9 +195,14 @@ public class PartnerController extends BaseController {
dataMap.put("isActive",hhrUser.getIsActive());
dataMap.put("idCardImgUrl",hhrUser.getIdcardImgUrl());
dataMap.put("studentImgUrl",hhrUser.getStudentImgUrl());
dataMap.put("fxs",hhrUser.getFxs());
fxsCount = hhrUser.getFxs().length() == 0?0:hhrUser.getFxs().split(",").length;
dataMap.put("fxsCount",fxsCount);
if(StringUtils.isNotBlank(hhrUser.getFxs())){
dataMap.put("fxs",hhrUser.getFxs());
fxsCount = hhrUser.getFxs().length() == 0?0:hhrUser.getFxs().split(",").length;
dataMap.put("fxsCount",fxsCount);
}else {
dataMap.put("fxs","");
dataMap.put("fxsCount",fxsCount);
}
dataMap.put("hasHhr","0");
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment