Ver código fonte

合成分支解决

gaodm 6 anos atrás
pai
commit
c4be779b86

+ 1 - 1
diagbotman-service/src/main/java/com/diagbot/facade/LantoneProductFacade.java

@@ -341,7 +341,7 @@ public class LantoneProductFacade extends LantoneProductServiceImpl {
             }
             String[] strs1 = acssName.split(",");
             for (int j = 0; j<strs1.length;j++){
-                acssNamebc += AccessTypeEnum.getName(Integer.parseInt(strs[j]))+",";
+                acssNamebc += AccessTypeEnum.getName(Integer.parseInt(strs1[j]))+",";
             }
             lantoneProductDTO.setChargeTypeName(charNamebc);
             lantoneProductDTO.setAccessTypeName(acssNamebc);

+ 2 - 1
diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -189,7 +189,8 @@
             <if test="gmtModified !=null">a.gmt_modified=#{gmtModified},</if>
             <if test="modifier != null">a.modifier=#{modifier},</if>
             <if test="startTime != null">a.start_time = #{startTime},</if>
-            <if test="endTime != null">a.end_time = #{endTime}</if>
+            <if test="endTime != null">a.end_time = #{endTime},</if>
+            <if test="serviceStatus != null">a.service_status = #{serviceStatus}</if>
         </trim>
         WHERE
         a.user_id = #{userId}