Commit ab437c8c authored by 竹天卫's avatar 竹天卫

没有公式的检测项 再校核的时候不显示

parent 82d7adf9
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
from sample_distribution sd from sample_distribution sd
left join team_group tg on tg.id = sd.team_group_id left join team_group tg on tg.id = sd.team_group_id
left join sys_user su on su.id = sd.user_id left join sys_user su on su.id = sd.user_id
where sd.sample_id = #{sampleId} where tg.check_element is not null and sd.sample_id = #{sampleId}
group by sd.team_group_id,sd.user_id group by sd.team_group_id,sd.user_id
order by sd.team_group_id order by sd.team_group_id
</select> </select>
......
...@@ -50,7 +50,7 @@ public class WeiXinService { ...@@ -50,7 +50,7 @@ public class WeiXinService {
System.out.println("==================code==================="); System.out.println("==================code===================");
System.out.println(code); System.out.println(code);
try { try {
String accessToken = null; /*String accessToken = null;
if (type.equals("PC")) { if (type.equals("PC")) {
accessToken = getAccessToken(); accessToken = getAccessToken();
} else if (type.equals("APP")) { } else if (type.equals("APP")) {
...@@ -67,10 +67,10 @@ public class WeiXinService { ...@@ -67,10 +67,10 @@ public class WeiXinService {
String UserId = jsonObject.getString("UserId"); String UserId = jsonObject.getString("UserId");
System.out.println("==================UserId==================="); System.out.println("==================UserId===================");
System.out.println(UserId); System.out.println(UserId);
JSONObject userJson = getUser(accessToken, UserId); JSONObject userJson = getUser(accessToken, UserId);*/
QueryWrapper<SysUser> wrapper = new QueryWrapper<>(); QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
wrapper.eq("phone", userJson.get("mobile")); // wrapper.eq("phone", userJson.get("mobile"));
// wrapper.eq("phone", code); //暂时用手机号代替code wrapper.eq("phone", code); //暂时用手机号代替code
SysUser sysUser = userService.getOne(wrapper); SysUser sysUser = userService.getOne(wrapper);
if (sysUser == null) { if (sysUser == null) {
return BaseResponse.errorMsg("非系统用户不允许登录!"); return BaseResponse.errorMsg("非系统用户不允许登录!");
......
...@@ -8,7 +8,7 @@ spring: ...@@ -8,7 +8,7 @@ spring:
datasource: datasource:
# 192.168.110.85 admin!@#123 # 192.168.110.85 admin!@#123
# url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false # url: jdbc:mysql://192.168.110.85:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
url: jdbc:mysql://81.68.92.175:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false url: jdbc:mysql://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
username: root username: root
password: admin!@#123 password: admin!@#123
driverClassName: com.mysql.cj.jdbc.Driver driverClassName: com.mysql.cj.jdbc.Driver
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment