父订单状态为0的bug 角色为空的异常 品牌logo校验检测

commons/src/main/java/com/jzg/commons/entity/dto/SysSystemEditParam.java

@@ -71,7 +71,6 @@ public class SysSystemEditParam {
 
     /** 系统图标 */
     @Schema(description = "系统图标")
-    @NotNull(message = "品牌LOGO不能为空")
     private String sysIcon;
 
     /** 联系人 */

platform/src/main/java/com/jzg/service/impl/SysMenuServiceImpl.java

@@ -78,7 +78,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
     public List<SysMenu> getRoleMenuTree(String systemCode, String userId) {
         List<SysUserRole> sysUserRole = sysUserRoleMapper.selectByUserIdAndSysCodeOne(userId,systemCode);
         // modify by lipf ,2026年4月3日08:52:05， 解决NPE 异常
-        if(sysUserRole == null){
+        if(sysUserRole == null || sysUserRole.isEmpty()){
             log.info("租户[{}]下的用户[{}]角色为空",systemCode, userId);
             return Collections.emptyList();
         }

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -56,6 +56,7 @@ import com.jzg.quotation.summary.mapper.*;
 import com.jzg.quotation.summary.service.*;
 import com.jzg.quotation.summary.state.listener.OrderStateListener;
 import com.jzg.quotation.summary.utils.StatisticsUtil;
+import io.seata.spring.annotation.GlobalTransactional;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -809,12 +810,18 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     }
 
+    @GlobalTransactional
     @Override
     public void orderAfterUpdateFailedQuote(String ordersNo, String errMessage) {
         // 检测主订单是否存在
         InsOrders insOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId, ordersNo));
         AssertionUtils.isFail(Objects.isNull(insOrders), "订单不存在");
 
+        // 同时更新父订单
+        InsOrders baseOrders = insOrdersMapper.selectOne(new LambdaQueryWrapper<InsOrders>().eq(InsOrders::getId, insOrders.getParentId()));
+        baseOrders.setOrderStatus(InsOrderStatusEnum.QUOTE_FAIL.getCode());
+        baseMapper.updateById(baseOrders);
+
         InsOrdersCarInfo carInfo = ordersCarInfoService.getByOrderId(insOrders.getId());
         //设置订单状态
         StateResult stateResult = orderStateListener.statusChange(InsOrderStatusEnum.QUOTE_FAIL, insOrders.getOrderStatus());