Merge branch 'dsc' into 'develop'

Dsc

See merge request 8timerv2/8timerapiv200!27

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

@@ -232,8 +232,8 @@ public class DzhtController {
 		list.add(map13);
 		list.add(map13);
 		return ResultUtil.data(list);
 		return ResultUtil.data(list);
 	}
 	}
-
-	final static String savePath = "E:\\esignHtmb";// 本地服务器文件保存路径
+	
+	final static String savePath = "esignTemplate";// 本地服务器文件保存路径
 	final static String APP_ID = ConfigConstant.PROJECT_ID;// 项目id
 	final static String APP_ID = ConfigConstant.PROJECT_ID;// 项目id
 	final static String APP_SECRET = ConfigConstant.PROJECT_SECRET;// 项目密码
 	final static String APP_SECRET = ConfigConstant.PROJECT_SECRET;// 项目密码
 //	final static String RE_TOKEN = "8b58973c290cc848b67ff0017cd424ff";
 //	final static String RE_TOKEN = "8b58973c290cc848b67ff0017cd424ff";
@@ -680,6 +680,9 @@ public class DzhtController {
 	@GetMapping("/queryName")
 	@GetMapping("/queryName")
 	@ApiOperation(value = "查员工名字", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "查员工名字", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> getName(@RequestParam String empNum) {
 	public Result<Object> getName(@RequestParam String empNum) {
+		System.err.println(System.getProperty("os.name"));
+		System.err.println(System.getProperty("os.arch"));
+		System.err.println(System.getProperty("os.version"));
 		return ResultUtil.data(YgglMainEmp.builder().build()
 		return ResultUtil.data(YgglMainEmp.builder().build()
 				.selectOne(new QueryWrapper<YgglMainEmp>().eq("emp_num", empNum)).getName());
 				.selectOne(new QueryWrapper<YgglMainEmp>().eq("emp_num", empNum)).getName());
 	}
 	}

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

@@ -192,7 +192,8 @@ public class DzhtController2 {
 	@ApiOperation(value = "创建机构模板印章", httpMethod = "POST", notes = "接口发布说明")
 	@ApiOperation(value = "创建机构模板印章", httpMethod = "POST", notes = "接口发布说明")
 	public Result<Object> orgTemplate(@CurrentUser UserBean userBean, @RequestBody DzhtAssoQyyz qyyz) {
 	public Result<Object> orgTemplate(@CurrentUser UserBean userBean, @RequestBody DzhtAssoQyyz qyyz) {
 		String orgId = DzhtAssoQyzc.builder().build().selectOne(
 		String orgId = DzhtAssoQyzc.builder().build().selectOne(
-				new QueryWrapper<DzhtAssoQyzc>().eq("third_party_user_id", qyyz.getThirdPartyUserId()).select("org_id"))
+//				new QueryWrapper<DzhtAssoQyzc>().eq("third_party_user_id", qyyz.getThirdPartyUserId()).select("org_id"))
+				new QueryWrapper<DzhtAssoQyzc>().eq("org_code", userBean.getOrgCode()).select("org_id"))
 				.getOrgId();// 查询orgId
 				.getOrgId();// 查询orgId
 		// String orgId = "dfd84b9a58d345ea90f6711bad853435";// 测试公司账户
 		// String orgId = "dfd84b9a58d345ea90f6711bad853435";// 测试公司账户
 		// 印章参数
 		// 印章参数

src/test/.gitignore

+/java/