Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResWaterBlockServiceImpl.java

@@ -41,7 +41,11 @@
      paramJson.put("phone", userClient.userInfoById(AuthUtil.getUserId()).getData().getPhone());
      attResWaterBlock.setUpdateBy(paramJson.toJSONString());

      return SqlHelper.retBool(baseMapper.updateAttResWaterBlockByResId(attResWaterBlock));
      Integer ret = baseMapper.updateAttResWaterBlockByResId(attResWaterBlock);
      if (ret == 0) {
         ret = baseMapper.addAttResWaterBlockByResId(attResWaterBlock);
      }
      return SqlHelper.retBool(ret);
   }

}