电子合同代码优化

src/main/java/cn/timer/api/controller/dzht/DzhtController.java

@@ -334,8 +334,10 @@ public class DzhtController {
 	public Result<Object> rzUserNow(@CurrentUser UserBean userBean, Integer empNum) {
 	public Result<Object> rzUserNow(@CurrentUser UserBean userBean, Integer empNum) {
 		DzhtAssoGrrz grrz = new DzhtAssoGrrz();
 		DzhtAssoGrrz grrz = new DzhtAssoGrrz();
 		grrz.setType(0);
 		grrz.setType(0);
+		System.err.println(empNum);
 		YgglMainEmp yg = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().select("phone")
 		YgglMainEmp yg = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().select("phone")
 				.eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
 				.eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
+		System.err.println(yg);
 		grrz.setMobileNo(yg.getPhone());
 		grrz.setMobileNo(yg.getPhone());
 
 
 		DzhtAssoGrzc grzc = DzhtAssoGrzc.builder().build().selectOne(new QueryWrapper<DzhtAssoGrzc>()
 		DzhtAssoGrzc grzc = DzhtAssoGrzc.builder().build().selectOne(new QueryWrapper<DzhtAssoGrzc>()

src/main/java/cn/timer/api/controller/dzht/DzhtController2.java

@@ -97,7 +97,7 @@ public class DzhtController2 {
 			Integer orgCode = userBean.getOrgCode();
 			Integer orgCode = userBean.getOrgCode();
 
 
 			YgglMainEmp yg = YgglMainEmp.builder().build()
 			YgglMainEmp yg = YgglMainEmp.builder().build()
-					.selectOne(new QueryWrapper<YgglMainEmp>().eq("emp_num", empNum));
+					.selectOne(new QueryWrapper<YgglMainEmp>().eq("org_code", orgCode).eq("emp_num", empNum));
 
 
 			String phone = yg.getPhone();
 			String phone = yg.getPhone();
 			String name = yg.getName();
 			String name = yg.getName();
@@ -351,7 +351,8 @@ public class DzhtController2 {
 				dzhtQueryDto.getTotalPage() == null ? 10 : dzhtQueryDto.getTotalPage());
 				dzhtQueryDto.getTotalPage() == null ? 10 : dzhtQueryDto.getTotalPage());
 		QueryWrapper<DzhtAssoHtmb> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<DzhtAssoHtmb> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("is_del", 0).eq("emp_num", userBean.getEmpNum()).like(mbmc != null, "mbmc", mbmc)
 		queryWrapper.eq("is_del", 0).eq("emp_num", userBean.getEmpNum()).like(mbmc != null, "mbmc", mbmc)
-				.select("template_id", "mbmc", "file_name", "created_time").orderByDesc("created_time");
+				.eq("org_code", userBean.getOrgCode()).select("template_id", "mbmc", "file_name", "created_time")
+				.orderByDesc("created_time");
 		IPage<DzhtAssoHtmb> dPage = DzhtAssoHtmb.builder().build().selectPage(page, queryWrapper);
 		IPage<DzhtAssoHtmb> dPage = DzhtAssoHtmb.builder().build().selectPage(page, queryWrapper);
 		List<DzhtAssoHtmb> htmbs = dPage.getRecords();
 		List<DzhtAssoHtmb> htmbs = dPage.getRecords();
 		dPage.getCurrent();
 		dPage.getCurrent();

src/main/java/cn/timer/api/controller/htzz/HtzzController.java

@@ -153,7 +153,7 @@ public class HtzzController {
 				htzzQueryDto.getTotalPage() == null ? 10 : htzzQueryDto.getTotalPage());
 				htzzQueryDto.getTotalPage() == null ? 10 : htzzQueryDto.getTotalPage());
 
 
 		QueryWrapper<HtzzAdminZzda> queryWrapper = new QueryWrapper<>();
 		QueryWrapper<HtzzAdminZzda> queryWrapper = new QueryWrapper<>();
-		queryWrapper.eq("lrrid", userBean.getEmpNum()).eq("org_code", userBean.getOrgCode())
+		queryWrapper.eq("org_code", userBean.getOrgCode())
 				.select("id", "zjmc", "czry", "czrdh", "fzrq", "yxdqr", "txkg_type").eq("is_delete", 0)
 				.select("id", "zjmc", "czry", "czrdh", "fzrq", "yxdqr", "txkg_type").eq("is_delete", 0)
 				.gt(!StrUtil.hasBlank(e), "yxdqr", !StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
 				.gt(!StrUtil.hasBlank(e), "yxdqr", !StrUtil.hasBlank(e) ? e : "9999-01-01 00:00:00")
 				.and(!StrUtil.hasBlank(q), wq -> wq.like("zjmc", q).or().like("czry", q)).orderByDesc("lrsj_time");
 				.and(!StrUtil.hasBlank(q), wq -> wq.like("zjmc", q).or().like("czry", q)).orderByDesc("lrsj_time");