Merge commit 'e9b58fe4' into develop

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

@@ -340,13 +340,13 @@ public class YgglController {
 					KqglAssoYhsb kqjry = KqglAssoYhsb.builder().build().selectOne(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, login.getId()).eq(KqglAssoYhsb::getKqjid, kqj.getId()));
 					KqglAssoYhsb kqjry = KqglAssoYhsb.builder().build().selectOne(new QueryWrapper<KqglAssoYhsb>().lambda().eq(KqglAssoYhsb::getUserId, login.getId()).eq(KqglAssoYhsb::getKqjid, kqj.getId()));
 					if(kqjry == null) {
 					if(kqjry == null) {
 						
 						
-						YgglMainEmp yggluser = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getEmpNum, login.getId()));
+//						YgglMainEmp yggluser = YgglMainEmp.builder().build().selectOne(new QueryWrapper<YgglMainEmp>().lambda().eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).eq(YgglMainEmp::getEmpNum, login.getId()));
 						String url = mac_command+"/addUserName";
 						String url = mac_command+"/addUserName";
 				        HttpHeaders headers = new HttpHeaders();
 				        HttpHeaders headers = new HttpHeaders();
 				        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
 				        MultiValueMap<String, Object> params = new LinkedMultiValueMap<>();
 				        params.add("devId", kqj.getCode());
 				        params.add("devId", kqj.getCode());
 				        params.add("userId", login.getId());
 				        params.add("userId", login.getId());
-				        params.add("userName", yggluser.getName());
+				        params.add("userName", ygglMainEmp.getName());
 				        RestTemplate restTemplate = new RestTemplate();
 				        RestTemplate restTemplate = new RestTemplate();
 				        HttpEntity httpEntity = new HttpEntity(params, headers);
 				        HttpEntity httpEntity = new HttpEntity(params, headers);
 				        ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);
 				        ResponseEntity<String> request = restTemplate.postForEntity(url, httpEntity, String.class);