Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -16,5 +16,5 @@ patches:
     name: ims-svc
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
-  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly/ims
-  newTag: e808927275ea9039eb60fca038d88eee63183d9f
+  newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
+  newTag: 22e5dcdd0bd2ade526032be0291855d8821edb37

release-service/src/main/java/com/mmc/csf/release/service/impl/RequirementsServiceImpl.java

@@ -45,7 +45,8 @@ public class RequirementsServiceImpl implements RequirementsService {
     public ResultBody publish(RequirementsInfoVO requirementsInfoVO) {
         //是否完成认证
         UserAccountSimpleDTO userAccountSimpleDTO = userAppApi.feignGetUserSimpleInfo(requirementsInfoVO.getUserAccountId());
-        if (userAccountSimpleDTO == null || !userAccountSimpleDTO.getCompanyAuthStatus().equals("1")){
+        log.info("userAccountSimpleDTO: " + JSONObject.toJSON(userAccountSimpleDTO));
+        if (userAccountSimpleDTO == null || !userAccountSimpleDTO.getCompanyAuthStatus().toString().equals("1")){
             return ResultBody.error(ResultEnum.COMPANY_NOT_VERIFY_ERROR);
         }
         RequirementsInfoDO requirementsInfoDO = new RequirementsInfoDO(requirementsInfoVO);

release-service/src/main/resources/mapper/case/IndustryCaseDao.xml

@@ -14,7 +14,7 @@
             </foreach>
         </if>
         <if test="date != null ">
-            Date(create_time) = #{date}
+            and Date(create_time) = #{date}
         </if>
     </select>
 
@@ -36,7 +36,7 @@
             </foreach>
         </if>
         <if test="date != null ">
-            Date(create_time) = #{date}
+            and Date(create_time) = #{date}
         </if>
         order by create_time desc
         limit #{pageNo}, #{pageSize}

release-service/src/main/resources/mapper/news/IndustryNewsDao.xml

@@ -13,7 +13,7 @@
             </foreach>
         </if>
         <if test="date != null ">
-            Date(create_time) = #{date}
+            and Date(create_time) = #{date}
         </if>
     </select>
 
@@ -35,7 +35,7 @@
             </foreach>
         </if>
         <if test="date != null ">
-            Date(create_time) = #{date}
+            and Date(create_time) = #{date}
         </if>
         order by create_time desc
         limit #{pageNo}, #{pageSize}

release-service/src/main/resources/mapper/requirements/RequirementsDao.xml

@@ -26,16 +26,16 @@
         select count(*) from requirements_info
         where is_deleted = 0
         <if test="date != null ">
-            Date(create_time) = #{date}
+            and Date(create_time) = #{date}
         </if>
         <if test="provinceCode != null ">
-            province_code = #{provinceCode}
+            and province_code = #{provinceCode}
         </if>
         <if test="cityCode != null ">
-            city_code = #{cityCode}
+            and city_code = #{cityCode}
         </if>
         <if test="districtCode != null ">
-            district_code = #{districtCode}
+            and district_code = #{districtCode}
         </if>
     </select>
 
@@ -46,23 +46,23 @@
         publish_name,
         publish_phone,
         require_description,
-        is_solved,
-        is_deleted,
+        is_solved as solved,
+        is_deleted as deleted,
         create_time,
         update_time
         from requirements_info
         where is_deleted = 0
         <if test="date != null ">
-            Date(create_time) = #{date}
+            and Date(create_time) = #{date}
         </if>
         <if test="provinceCode != null ">
-            province_code = #{provinceCode}
+            and province_code = #{provinceCode}
         </if>
         <if test="cityCode != null ">
-            city_code = #{cityCode}
+            and city_code = #{cityCode}
         </if>
         <if test="districtCode != null ">
-            district_code = #{districtCode}
+            and district_code = #{districtCode}
         </if>
         order by create_time desc
         limit #{pageNo}, #{pageSize}