准备演示版本111111

cement-business/src/main/java/cn/wise/sc/cement/business/controller/WeiXinController.java

@@ -36,9 +36,9 @@ public class WeiXinController {
         log.debug("=============================================");
         try {
             //测试服务器
-            return weiXinService.getTestToken(code);
+//            return weiXinService.getTestToken(code);
             //正式服务器
-//            return weiXinService.getToken(code, "APP");
+            return weiXinService.getToken(code, "APP");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }
@@ -50,9 +50,9 @@ public class WeiXinController {
     public BaseResponse getPCToken(String code) {
         try {
             //测试服务器
-            return weiXinService.getTestToken(code);
+//            return weiXinService.getTestToken(code);
             //正式服务器
-//            return weiXinService.getToken(code, "PC");
+            return weiXinService.getToken(code, "PC");
         } catch (Exception e) {
             log.debug("获取登录token{}", e);
         }

cement-business/src/main/java/cn/wise/sc/cement/business/service/impl/PrecipriceServiceImpl.java

@@ -224,8 +224,6 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
 
     @Override
     public BaseResponse<List<NormProductionStatistics>> normProductionStatistics(Long start, Long end, String name, Integer groupId) {
-
-        //曲解、心有灵犀、捧着、不争论、心态口才策略
         //统计分样处理的详情
         List<NormProduction.NormProductionDetail> normProductionDetails =
                 normProductionDetails(null, start, end);
@@ -260,7 +258,7 @@ public class PrecipriceServiceImpl extends ServiceImpl<PrecipriceMapper, Precipr
             SysUser sysUser = users.stream()
                     .filter(arg -> arg.getId().intValue() == userId)
                     .findFirst().orElse(null);
-            SysGroup sysGroup = sysGroups.stream().filter(arg -> arg.getId().intValue() == userId)
+            SysGroup sysGroup = sysGroups.stream().filter(arg -> arg.getId().intValue() == sysUser.getGroupId())
                     .findFirst().orElse(null);
             if (sysUser == null) {
                 continue;

cement-business/src/main/resources/application.yml

@@ -7,8 +7,8 @@ spring:
     active: dev
   datasource:
     # 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://47.93.148.213: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://47.93.148.213:3306/sinoma_tcdri?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=UTF-8&useSSL=false
     username: root
     password: admin!@#123
     driverClassName: com.mysql.cj.jdbc.Driver