修改BUG 审批汇总 部门显示错误

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -435,7 +435,6 @@ public class YgglController {
 			YgglMainEmp emp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getPhone, ygglMainEmp.getEmpLoginPhone())
 			YgglMainEmp emp = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getPhone, ygglMainEmp.getEmpLoginPhone())
 					.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
 					.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()));
 			if(StringUtils.isEmpty(login) && StringUtils.isEmpty(emp)){
 			if(StringUtils.isEmpty(login) && StringUtils.isEmpty(emp)){
-				YgglMainEmp.builder().phone(ygglMainEmp.getEmpLoginPhone()).build().update(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getId, emp.getId()));
 				QyzxEmpLogin.builder().phone(ygglMainEmp.getEmpLoginPhone()).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getId,ygglMainEmp.getEmpNum()));
 				QyzxEmpLogin.builder().phone(ygglMainEmp.getEmpLoginPhone()).build().update(new QueryWrapper<QyzxEmpLogin>().lambda().eq(QyzxEmpLogin::getId,ygglMainEmp.getEmpNum()));
 			}else{
 			}else{
 				return ResultUtil.error("该号码已存在，请更换员工登陆账号");
 				return ResultUtil.error("该号码已存在，请更换员工登陆账号");

src/main/resources/mapping/spmk/SpmkApproveSummaryMapper.xml

@@ -100,9 +100,9 @@
     <select id="selectPageByQuery" resultMap="BaseResultMap_As" >
     <select id="selectPageByQuery" resultMap="BaseResultMap_As" >
         SELECT 
         SELECT 
         	<include refid="Base_Column_List_a" />,
         	<include refid="Base_Column_List_a" />,
-        	(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num limit 1) limit 1) as gw_name,
-			(SELECT id FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num limit 1) limit 1) limit 1) as bm_id,
-			(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num limit 1) limit 1) limit 1) as bm_name
+        	(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num and a.org_code=org_code limit 1) limit 1) as gw_name,
+			(SELECT id FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num and a.org_code=org_code limit 1) limit 1) limit 1) as bm_id,
+			(SELECT name FROM zzgl_bmgw_m WHERE id = (SELECT up_id FROM zzgl_bmgw_m WHERE id = (SELECT bmgw_id FROM yggl_main_emp WHERE a.emp_num = emp_num and a.org_code=org_code limit 1) limit 1) limit 1) as bm_name
         FROM spmk_approve_summary a
         FROM spmk_approve_summary a
         WHERE a.org_code = #{param.orgCode} 
         WHERE a.org_code = #{param.orgCode} 
         	<if test="param.query != null and param.query != ''">
         	<if test="param.query != null and param.query != ''">