From f1b36f8ff106e437cf95748bab37484fe4749c0a Mon Sep 17 00:00:00 2001 From: jiangs <373297395@qq.com> Date: Thu, 18 Jun 2026 17:52:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E8=BE=93=E8=A1=80=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czblood/bus/pojo/XkOperatorInfo.java | 11 ++ .../bus/system/BloodExtInterfaceService.java | 76 +++++++++-- .../com/czblood/bus/utils/BloodBankUtil.java | 9 ++ .../main/resources/mapper/XkHosInfoMapper.xml | 20 +-- .../czblood/common/core/domain/Result.java | 28 +--- .../czblood/common/core/domain/ResultT.java | 4 - .../common/core/domain/entity/SysDept.java | 24 +++- .../common/core/domain/entity/SysUser.java | 129 ++++++++---------- .../system/service/ExtSystemInterface.java | 2 +- .../system/service/ISysUserService.java | 2 +- .../service/impl/SysUserServiceImpl.java | 12 +- .../controller/system/SysUserController.java | 3 +- .../resources/mapper/system/SysDeptMapper.xml | 17 ++- .../resources/mapper/system/SysUserMapper.xml | 36 +++-- sql/updatedb_blood.sql | 60 +++++++- 15 files changed, 288 insertions(+), 145 deletions(-) diff --git a/blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java b/blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java index 7aa07dd..ed47236 100644 --- a/blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java +++ b/blood_bus/src/main/java/com/czblood/bus/pojo/XkOperatorInfo.java @@ -1,6 +1,7 @@ package com.czblood.bus.pojo; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -10,15 +11,25 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @ApiModel("员工信息表") public class XkOperatorInfo { + @ApiModelProperty("员工ID") private String operator_id; + @ApiModelProperty("员工姓名") private String operator_name; + @ApiModelProperty("员工密码") private String pwd; + @ApiModelProperty("工作组") private String work_group; + @ApiModelProperty("部门") private String dept; + @ApiModelProperty("员工类型") private String operator_type; + @ApiModelProperty("拼音") private String py; + @ApiModelProperty("输血科主任") private String is_bank_director; + @ApiModelProperty("医务部负责人") private String is_medical_director; + @ApiModelProperty("职称") private String postname; private String sign_pic; private String vshiscode; diff --git a/blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java b/blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java index ec07a82..02ee5e4 100644 --- a/blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java +++ b/blood_bus/src/main/java/com/czblood/bus/system/BloodExtInterfaceService.java @@ -2,15 +2,19 @@ package com.czblood.bus.system; import com.czblood.bus.mapper.XkHosInfoMapper; import com.czblood.bus.mapper.XkOperatorInfoMapper; +import com.czblood.bus.pojo.XkDmzd; import com.czblood.bus.pojo.XkHosInfo; import com.czblood.bus.pojo.XkOperatorInfo; +import com.czblood.bus.utils.BloodBankUtil; import com.czblood.common.core.domain.Result; +import com.czblood.common.core.domain.entity.SysDept; import com.czblood.common.core.domain.entity.SysLoginParam; import com.czblood.common.core.domain.entity.SysUser; import com.czblood.common.core.domain.model.LoginParam; import com.czblood.common.core.domain.model.LoginUser; import com.czblood.common.utils.SecurityUtils; import com.czblood.common.utils.StringUtils; +import com.czblood.system.mapper.SysDeptMapper; import com.czblood.system.mapper.SysUserMapper; import com.czblood.system.service.ExtSystemInterface; import com.czblood.system.service.ISysConfigService; @@ -19,6 +23,7 @@ import org.springframework.stereotype.Component; import javax.annotation.Resource; import java.util.List; +import java.util.stream.Collectors; /** * 登录接口 @@ -32,37 +37,57 @@ public class BloodExtInterfaceService implements ExtSystemInterface { XkOperatorInfoMapper xkOperatorInfoMapper; @Autowired private SysUserMapper userMapper; - @Autowired - private ISysConfigService configService; +// @Autowired +// private ISysConfigService configService; + @Resource + SysDeptMapper sysDeptMapper; + @Resource + BloodBankUtil bloodBankUtil; @Override - public Result syncUser() { + public Result syncUser(String loginYLJG) { + //同步科室 + Result result = syncDept(); + if(!result.getCode().equals("0")) return result; + int deptCount = Integer.parseInt(result.getData().toString()); //同步用户 XkOperatorInfo xkOperatorInfo = new XkOperatorInfo(); List xkOperatorInfoList = xkOperatorInfoMapper.queryList(xkOperatorInfo); + SysUser sysUser2 = new SysUser(); + List sysUserList = userMapper.selectUserList(sysUser2); + SysDept sysDept = new SysDept(); + List sysDeptList = sysDeptMapper.selectDeptList(sysDept); int j = 0; + long deptId = 0L; for (XkOperatorInfo operatorInfo : xkOperatorInfoList) { // 验证是否存在这个用户 - SysUser u = userMapper.selectUserByUserName(operatorInfo.getOperator_id()); - if(!StringUtils.isNull(u)) continue; + List collect = sysUserList.stream().filter(sysUser1 -> BloodBankUtil.isBank(sysUser1.getUserName()).equals(operatorInfo.getOperator_id())).collect(Collectors.toList()); + if(!collect.isEmpty()) continue; SysUser sysUser = new SysUser(); - sysUser.setDeptId(101L); + //查询科室ID + SysDept sysDept1 = sysDeptList.stream().filter(sysDept2 -> BloodBankUtil.isBank(sysDept2.getDeptCode()).equals(operatorInfo.getDept())).findFirst().orElse(null); + if(sysDept1 != null) deptId = sysDept1.getDeptId(); + sysUser.setDeptId(deptId); sysUser.setUserName(operatorInfo.getOperator_id()); sysUser.setNickName(operatorInfo.getOperator_name()); sysUser.setUserType("00"); sysUser.setSex("1"); - String password = configService.selectConfigByKey("sys.user.initPassword"); - sysUser.setPassword(SecurityUtils.encryptPassword(password)); + sysUser.setPassword(SecurityUtils.encryptPassword(operatorInfo.getPwd())); sysUser.setStatus("0"); sysUser.setCreateBy("admin"); - sysUser.setVshisuser(operatorInfo.getVshiscode()); - sysUser.setHos_id("602"); //以前老的输血系统没有医疗机构的概念，所以这里先给个之前的默认值 + sysUser.setPostname(operatorInfo.getPostname()); + sysUser.setWorkgroup(operatorInfo.getWork_group()); + sysUser.setOperator_type(operatorInfo.getOperator_type()); + sysUser.setIs_bank_director(operatorInfo.getIs_bank_director()); + sysUser.setIs_medical_director(operatorInfo.getIs_medical_director()); + //sysUser.setVshisuser(operatorInfo.getVshiscode()); + sysUser.setHos_id(loginYLJG); sysUser.setDelFlag("0"); userMapper.insertUser(sysUser); j++; } - return new Result("0","导入成功，共有："+j+"条数据导入！"); + return new Result("0","导入成功，员工共有："+j+"条数据导入，科室：共有："+deptCount+"条数据导入！"); } @@ -87,6 +112,33 @@ public class BloodExtInterfaceService implements ExtSystemInterface { * @return */ public Result syncDept(){ - return null; + int j = 0; + List xkDmzdList = bloodBankUtil.setDictCacheList("ks"); + SysDept sysDept = new SysDept(); + List sysDeptList = sysDeptMapper.selectDeptList(sysDept); + for (XkDmzd xkDmzd : xkDmzdList) { + List collect = sysDeptList.stream().filter(sysDept1 -> BloodBankUtil.isBank(sysDept1.getDeptCode()).equals(xkDmzd.getWordbook_code())).collect(Collectors.toList()); + if(!collect.isEmpty()) continue; + sysDept = new SysDept(); + sysDept.setParentId(100L); + sysDept.setAncestors("0,100"); + sysDept.setDeptName(xkDmzd.getWordbook_name()); + sysDept.setOrderNum(1); + sysDept.setDelFlag("0"); + String useSign = xkDmzd.getUse_sign(); + sysDept.setDeptCode(xkDmzd.getWordbook_code()); + if(useSign.equals("Y")) { + useSign = "1"; + }else{ + useSign = "0"; + } + sysDept.setStatus(useSign); + sysDept.setCreateBy("admin"); + sysDept.setCreateTime(bloodBankUtil.getCurrentTimeDate()); + sysDeptMapper.insertDept(sysDept); + j++; + } + + return new Result("0","导入成功，共有："+j+"条数据导入！",j); } } diff --git a/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java b/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java index f0533aa..6e220df 100644 --- a/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java +++ b/blood_bus/src/main/java/com/czblood/bus/utils/BloodBankUtil.java @@ -17,6 +17,7 @@ import org.springframework.data.redis.connection.ReactiveSubscription; import org.springframework.stereotype.Component; import javax.annotation.Resource; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -132,4 +133,12 @@ public class BloodBankUtil { } + public String getCurrentTime(){ + return commonUtil.getCurrentTime(); + } + + public Date getCurrentTimeDate(){ + return commonUtil.getCurrentTimeDate(); + } + } diff --git a/blood_bus/src/main/resources/mapper/XkHosInfoMapper.xml b/blood_bus/src/main/resources/mapper/XkHosInfoMapper.xml index 8aa3ef9..66b0c79 100644 --- a/blood_bus/src/main/resources/mapper/XkHosInfoMapper.xml +++ b/blood_bus/src/main/resources/mapper/XkHosInfoMapper.xml @@ -39,16 +39,16 @@ update xk_hos_info set - address = #{address}, - post_code = #{post_code}, - telno = #{telno}, - link_person = #{link_person}, - org_kind = #{org_kind}, - foot_mode = #{foot_mode}, - org_zone = #{org_zone}, - org_street = #{org_street}, - hospital_name = #{hospital_name}, - sfby = #{sfby}, + address = #{address}, + post_code = #{post_code}, + telno = #{telno}, + link_person = #{link_person}, + org_kind = #{org_kind}, + foot_mode = #{foot_mode}, + org_zone = #{org_zone}, + org_street = #{org_street}, + hospital_name = #{hospital_name}, + sfby = #{sfby}, hospital_code = #{hospital_code} where hospital_code = #{hospital_code} diff --git a/blood_common/src/main/java/com/czblood/common/core/domain/Result.java b/blood_common/src/main/java/com/czblood/common/core/domain/Result.java index a343eb2..0167f78 100644 --- a/blood_common/src/main/java/com/czblood/common/core/domain/Result.java +++ b/blood_common/src/main/java/com/czblood/common/core/domain/Result.java @@ -25,17 +25,8 @@ public class Result { @ApiModelProperty(value = "响应消息", example = "操作成功", notes = "接口返回的提示信息") private String msg; private Object data; - @ApiModelProperty(value = "下一步请求URL", notes = "后续需要请求的接口地址") - private String url; - @ApiModelProperty(value = "下一步请求方法", example = "GET", notes = "GET/POST/PUT/DELETE等") - private String method; - @ApiModelProperty(value = "下一步请求参数", notes = "后续请求需要携带的参数") - private Object params; - - @ApiModelProperty(value = "问题ID", example = "1001", notes = "关键业务标识ID") - private Integer problemId; public Result(String resultCode, String message) { super(); this.code = resultCode; @@ -47,23 +38,6 @@ public class Result { this.msg = message; this.data = data; } - public Result(String resultCode, String message,Integer problemId) { - this.code = resultCode; - this.msg = message; - Integer problemId0=problemId; - HttpServletRequest request = ServletUtils.getRequest(); - this.url = request.getContextPath() + request.getServletPath(); - this.method = request.getMethod(); - if("GET".equals(this.method)){ - this.params = ServletUtils.getParamMap(request); - }else { - try { - this.data = JsonParamUtils.getJsonParams(request); - } catch (IOException e) { - throw new RuntimeException(e); - } - } - this.problemId=problemId0; - } + } diff --git a/blood_common/src/main/java/com/czblood/common/core/domain/ResultT.java b/blood_common/src/main/java/com/czblood/common/core/domain/ResultT.java index c4189a5..cbc1f75 100644 --- a/blood_common/src/main/java/com/czblood/common/core/domain/ResultT.java +++ b/blood_common/src/main/java/com/czblood/common/core/domain/ResultT.java @@ -72,10 +72,6 @@ public class ResultT extends Result { ResultT resultT = new ResultT<>(); resultT.setCode(oldResult.getCode()); resultT.setMsg(oldResult.getMsg()); - resultT.setUrl(oldResult.getUrl()); - resultT.setMethod(oldResult.getMethod()); - resultT.setParams(oldResult.getParams()); - resultT.setProblemId(oldResult.getProblemId()); // 调用父类setData(Object)，无冲突 Object oldData = oldResult.getData(); diff --git a/blood_common/src/main/java/com/czblood/common/core/domain/entity/SysDept.java b/blood_common/src/main/java/com/czblood/common/core/domain/entity/SysDept.java index 4832e75..ab16fd2 100644 --- a/blood_common/src/main/java/com/czblood/common/core/domain/entity/SysDept.java +++ b/blood_common/src/main/java/com/czblood/common/core/domain/entity/SysDept.java @@ -52,10 +52,22 @@ public class SysDept extends BaseEntity /** 父部门名称 */ private String parentName; - + + private String deptCode; + + private String hos_id; + /** 子部门 */ private List children = new ArrayList(); + public String getHos_id() { + return hos_id; + } + + public void setHos_id(String hos_id) { + this.hos_id = hos_id; + } + public Long getDeptId() { return deptId; @@ -182,6 +194,14 @@ public class SysDept extends BaseEntity this.children = children; } + public String getDeptCode() { + return deptCode; + } + + public void setDeptCode(String deptCode) { + this.deptCode = deptCode; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -199,6 +219,8 @@ public class SysDept extends BaseEntity .append("createTime", getCreateTime()) .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) + .append("deptCode", getDeptCode()) + .append("hos_id", getHos_id()) .toString(); } } diff --git a/blood_common/src/main/java/com/czblood/common/core/domain/entity/SysUser.java b/blood_common/src/main/java/com/czblood/common/core/domain/entity/SysUser.java index 99a15d5..83fdf99 100644 --- a/blood_common/src/main/java/com/czblood/common/core/domain/entity/SysUser.java +++ b/blood_common/src/main/java/com/czblood/common/core/domain/entity/SysUser.java @@ -88,6 +88,60 @@ public class SysUser extends BaseEntity /** 角色ID */ private Long roleId; + /** 岗位名称 */ + private String postname; + /** 工作组 */ + private String workgroup; + /** 操作类型 */ + private String operator_type; + /** + * 输血科主任 + */ + private String is_bank_director; + /** + * 医务部负责人 + */ + private String is_medical_director; + + public String getPostname() { + return postname; + } + + public void setPostname(String postname) { + this.postname = postname; + } + + public String getWorkgroup() { + return workgroup; + } + + public void setWorkgroup(String workgroup) { + this.workgroup = workgroup; + } + + public String getOperator_type() { + return operator_type; + } + + public void setOperator_type(String operator_type) { + this.operator_type = operator_type; + } + + public String getIs_bank_director() { + return is_bank_director; + } + + public void setIs_bank_director(String is_bank_director) { + this.is_bank_director = is_bank_director; + } + + public String getIs_medical_director() { + return is_medical_director; + } + + public void setIs_medical_director(String is_medical_director) { + this.is_medical_director = is_medical_director; + } public String getUserType() { return userType; @@ -98,14 +152,7 @@ public class SysUser extends BaseEntity } private String userType; - private String vshisuser; - private String vshisuser1; - private String vshisuser2; private String hos_id; - private String sn; - private String snid; - private String signCert; - private String sn_pin; private SysLoginParam sysLoginParam; public SysLoginParam getSysLoginParam() { @@ -116,62 +163,6 @@ public class SysUser extends BaseEntity this.sysLoginParam = sysLoginParam; } - public String getVshisuser() { - return vshisuser; - } - - public void setVshisuser(String vshisuser) { - this.vshisuser = vshisuser; - } - - public String getVshisuser1() { - return vshisuser1; - } - - public void setVshisuser1(String vshisuser1) { - this.vshisuser1 = vshisuser1; - } - - public String getVshisuser2() { - return vshisuser2; - } - - public void setVshisuser2(String vshisuser2) { - this.vshisuser2 = vshisuser2; - } - - public String getSn() { - return sn; - } - - public void setSn(String sn) { - this.sn = sn; - } - - public String getSnid() { - return snid; - } - - public void setSnid(String snid) { - this.snid = snid; - } - - public String getSignCert() { - return signCert; - } - - public void setSignCert(String signCert) { - this.signCert = signCert; - } - - public String getSn_pin() { - return sn_pin; - } - - public void setSn_pin(String sn_pin) { - this.sn_pin = sn_pin; - } - public SysUser() { @@ -410,14 +401,12 @@ public class SysUser extends BaseEntity .append("updateTime", getUpdateTime()) .append("remark", getRemark()) .append("dept", getDept()) - .append("vshisuser",getVshisuser()) - .append("vshisuser1",getVshisuser1()) - .append("vshisuser2",getVshisuser1()) .append("hos_id",getHos_id()) - .append("sn",getSn()) - .append("snid",getSnid()) - .append("signCert",getSignCert()) - .append("sn_pin",getSn_pin()) + .append("postname",getPostname()) + .append("workgroup",getWorkgroup()) + .append("operator_type",getOperator_type()) + .append("is_bank_director",getIs_bank_director()) + .append("is_medical_director",getIs_medical_director()) .toString(); } } diff --git a/blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java b/blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java index c70a575..3478662 100644 --- a/blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java +++ b/blood_system/src/main/java/com/czblood/system/service/ExtSystemInterface.java @@ -13,7 +13,7 @@ public interface ExtSystemInterface { * 同步用户 * @return */ - public Result syncUser() ; + public Result syncUser(String loginYLJG) ; /** diff --git a/blood_system/src/main/java/com/czblood/system/service/ISysUserService.java b/blood_system/src/main/java/com/czblood/system/service/ISysUserService.java index e0021f5..2b52a2a 100644 --- a/blood_system/src/main/java/com/czblood/system/service/ISysUserService.java +++ b/blood_system/src/main/java/com/czblood/system/service/ISysUserService.java @@ -206,7 +206,7 @@ public interface ISysUserService { */ public String importUser(List userList, Boolean isUpdateSupport, String operName); - Result syncUser(); + Result syncUser(String loginYLJG); public SysUser queryUserList(SysUser sysUser); } diff --git a/blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java b/blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java index de4a5f3..c69ef9c 100644 --- a/blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java +++ b/blood_system/src/main/java/com/czblood/system/service/impl/SysUserServiceImpl.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import javax.validation.Validator; import com.czblood.common.core.domain.Result; +import com.czblood.common.utils.HosIdHolder; import com.czblood.system.service.ExtSystemInterface; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -243,6 +244,12 @@ public class SysUserServiceImpl implements ISysUserService { @Override @Transactional public int insertUser(SysUser user) { + if (StringUtils.isEmpty(user.getHos_id())) { + String autoHosId = HosIdHolder.getHosId(); + if (StringUtils.isNotEmpty(autoHosId)) { + user.setHos_id(autoHosId); + } + } // 新增用户信息 int rows = userMapper.insertUser(user); // 新增用户岗位关联 @@ -505,8 +512,8 @@ public class SysUserServiceImpl implements ISysUserService { * @return */ @Override - public Result syncUser() { - extSystemInterface.syncUser(); + public Result syncUser(String loginYLJG) { + return extSystemInterface.syncUser(loginYLJG); // List comUsrList = comUsrMapper.getComUsrList(""); // int j = 0; // for (ComUsr comUsr : comUsrList) { @@ -536,7 +543,6 @@ public class SysUserServiceImpl implements ISysUserService { // // } // return new Result("0","导入成功，共有："+j+"条数据导入！"); - return new Result("-1","接口为定义！"); } @Override diff --git a/blood_system/src/main/java/com/czblood/system/web/controller/system/SysUserController.java b/blood_system/src/main/java/com/czblood/system/web/controller/system/SysUserController.java index 4d1658a..9a53243 100644 --- a/blood_system/src/main/java/com/czblood/system/web/controller/system/SysUserController.java +++ b/blood_system/src/main/java/com/czblood/system/web/controller/system/SysUserController.java @@ -240,6 +240,7 @@ public class SysUserController extends BaseController { @ApiOperation("同步用户数据") @GetMapping("/syncUser") public Result syncUser(){ - return userService.syncUser(); + String loginYLJG = getLoginUser().getSysLoginParam().getLoginYLJG(); + return userService.syncUser(loginYLJG); } } diff --git a/blood_system/src/main/resources/mapper/system/SysDeptMapper.xml b/blood_system/src/main/resources/mapper/system/SysDeptMapper.xml index b250cb8..c21942c 100644 --- a/blood_system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/blood_system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -20,10 +21,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time ,d.dept_code,d.hos_id from sys_dept d @@ -42,6 +44,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND status = #{status} + + AND dept_code = #{deptCode} + ${params.dataScope} order by d.parent_id, d.order_num @@ -83,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -98,8 +103,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" phone, email, status, + dept_code, create_by, - create_time + create_time,hos_id )values( #{parentId}, #{deptName}, @@ -109,8 +115,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{phone}, #{email}, #{status}, + #{deptCode}, #{createBy}, - getdate() + getdate(),#{hos_id} ) @@ -118,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dept parent_id = #{parentId}, + dept_code = #{deptCode}, dept_name = #{deptName}, ancestors = #{ancestors}, order_num = #{orderNum}, @@ -126,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" email = #{email}, status = #{status}, update_by = #{updateBy}, + hos_id = #{hos_id}, update_time = getdate() where dept_id = #{deptId} diff --git a/blood_system/src/main/resources/mapper/system/SysUserMapper.xml b/blood_system/src/main/resources/mapper/system/SysUserMapper.xml index c13f141..749a2dc 100644 --- a/blood_system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/blood_system/src/main/resources/mapper/system/SysUserMapper.xml @@ -23,13 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - + + + + + @@ -55,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, - u.hos_id, + u.hos_id, u.postname, u.workgroup, u.operator_type, u.is_bank_director, u.is_medical_director, d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status, r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status from sys_user u @@ -65,7 +64,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"