fix

run-prod.sh

@@ -1,41 +1,4 @@
-#!/usr/bin/env bash
-# 定义应用组名
-group_name='zhongzheng'
-# 定义应用名称
-app_name='zhongzheng-saas-api'
-# 定义应用版本
-app_version='1.0-SNAPSHOT'
-# 定义应用环境
-profile_active='prod'
-echo '----copy jar----'
-docker stop ${app_name}
-echo '----stop container----'
-docker rm ${app_name}
-echo '----rm container----'
-docker rmi ${group_name}/${app_name}:${app_version}
-echo '----rm image----'
-# 打包编译docker镜像
-docker build -f /mydata/maven/build/Dockerfile -t ${group_name}/${app_name}:${app_version} .
-echo '----build image----'
-docker run -p 5055:5055 --name ${app_name} \
---restart=always \
--e 'spring.profiles.active'=${profile_active} \
--e TZ="Asia/Shanghai" \
--m 10240m \
---cpus=3 \
---log-opt max-size=50m \
---log-opt max-file=3 \
--v /etc/localtime:/etc/localtime \
--v /usr/share/fonts:/usr/share/fonts \
--v /data/logs/prod_api:/logs \
--v /mydata/app/${app_name}/logs:/var/logs \
--d ${group_name}/${app_name}:${app_version}
-echo '----start container----'
 
-echo "开始等待20秒..."
-# 1-10秒内随机
-sleep 5
-echo "等待后继续"
 
 #!/usr/bin/env bash
 # 定义应用组名

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/mapper/ClassGradeUserMapper.java

@@ -110,4 +110,7 @@ public interface ClassGradeUserMapper extends BaseMapper<ClassGradeUser> {
     List<ClassPeriodStudentVo> listBKUserPeriod(ClassGradeUserQueryBo bo);
 
     List<UserUsbRecordVo> getListUserSubscribe(UserUsbRecordBo bo);
+
+    @InterceptorIgnore(tenantLine = "true")
+    Boolean updateGradeUser(ClassGradeUser bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -3754,12 +3754,17 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if(classGradeUser.getSevenPushCheck()==0||classGradeUser.getSevenPushCheck()==2){
             throw new CustomException("无效操作");
         }
-        LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
+        /*LambdaUpdateWrapper<ClassGradeUser> objectLambdaUpdateWrapper = Wrappers.lambdaUpdate();
         objectLambdaUpdateWrapper.eq(ClassGradeUser::getId, bo.getGradeUserId());
         objectLambdaUpdateWrapper.set(ClassGradeUser::getSevenPushCheck, bo.getPushStatus()+1);
         objectLambdaUpdateWrapper.set(ClassGradeUser::getUpdateTime, DateUtils.getNowTime());
-        objectLambdaUpdateWrapper.set(ClassGradeUser::getSevenPushReason, bo.getSevenPushReason());
-        return this.update(null, objectLambdaUpdateWrapper);
+        objectLambdaUpdateWrapper.set(ClassGradeUser::getSevenPushReason, bo.getSevenPushReason());*/
+        ClassGradeUser gradeUser = new ClassGradeUser();
+        gradeUser.setId(bo.getGradeUserId());
+        gradeUser.setSevenPushCheck(bo.getPushStatus()+1);
+        gradeUser.setSevenPushReason(bo.getSevenPushReason());
+        gradeUser.setId(bo.getGradeUserId());
+        return this.baseMapper.updateGradeUser(gradeUser);
     }
 
     @Override

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -2100,4 +2100,17 @@
         </if>
         order by us.create_time DESC
     </select>
+
+    <update id="updateGradeUser" parameterType="com.zhongzheng.modules.grade.domain.ClassGradeUser" >
+        update class_grade_user
+        <set>
+            <if test="sevenPushCheck != null">
+                seven_push_check = #{sevenPushCheck},
+            </if>
+            <if test="sevenPushReason != null ">
+                seven_push_reason=#{sevenPushReason},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
 </mapper>