Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/dao/TycpdmFirmDao.java

@@ -49,8 +49,8 @@ public interface TycpdmFirmDao extends BaseMapper<TycpdmFirmEntity> {
     @Select("select count(1) from tycpdm_firm where firmName=#{firmname} and logout_flag=1")
     int selectByIdFirmNameSC(@Param("firmname") String firmname);
 
-    @Select("select count(1) from tycpdm_firm where certificateCode=#{certificateCode} and logout_flag=1")
-    int selectByIdCertificateCode(@Param("certificateCode") String certificateCode);
+    @Select("select count(1) from tycpdm_firm where certificateCode=#{certificateCode} and logout_flag=1 and f_id<>#{fId}")
+    int selectByIdCertificateCode(@Param("certificateCode") String certificateCode,@Param("fId") String fId);
 
     @Select("select count(1) from firm where firm_name=#{firmname} and (logout_flag=2 or logout_flag=0)")
     int selectByIdFirmNameXTSC(@Param("firmname")String firmname);

src/main/java/io/office/modules/manage/entity/dto/NewsParams.java

@@ -14,7 +14,7 @@ import java.util.*;
 @Data
 public class NewsParams extends PageParams {
     private String title;
-    private int levels;
+    private String levels;
     private String author;
     private String editor;
     private String keyword;

src/main/java/io/office/modules/manage/service/impl/TycpdmFirmServiceImpl.java

@@ -323,7 +323,8 @@ public class TycpdmFirmServiceImpl extends ServiceImpl<TycpdmFirmDao, TycpdmFirm
         if (!AlgorithmUtils.checkUSCC(certificateCode.toString())){
             throw new RRException("统一社会信用代码输入错误");
         }
-        if(tycpdmFirmDao.selectByIdCertificateCode(String.valueOf(certificateCode))>0){
+
+        if(tycpdmFirmDao.selectByIdCertificateCode(String.valueOf(certificateCode),String.valueOf(body.get("fid")))>0){
             throw new RRException("统一社会信用代码已存在");
         }
         //写入死值

src/main/resources/mapper/manage/IndexCarouselManageDao.xml

@@ -36,7 +36,8 @@
                 t.lasteditor_index,
                 t.check_index_author,
                 t.checkflag_index,
-                t.levels
+                t.levels,
+                t.directpath
         FROM
                 index_carousel_manage t
         where 1=1
@@ -53,7 +54,7 @@
             and starttime_index BETWEEN #{indexCarouselManage.startTime} AND #{indexCarouselManage.endTime}
         </if>
         <choose>
-            <when test="indexCarouselManage.levels !=null and indexCarouselManage.levels !=''">
+            <when test="indexCarouselManage.levels !=null">
                 AND t.levels = #{indexCarouselManage.levels}
             </when>
             <otherwise>

src/main/resources/mapper/manage/NewsDao.xml

@@ -54,7 +54,8 @@
                 t.classid,
                 t.levels,
                 t.releasedate,
-                t.updatedate
+                t.updatedate,
+                t.directpath
         FROM
                 news t
         WHERE
@@ -94,7 +95,7 @@
                         a.classid in(429,430,428,435)
                 )
         <choose>
-            <when test="newsParams.levels == 0">
+            <when test="newsParams.levels !=null">
                 AND levels = #{newsParams.levels}
             </when>
             <otherwise>

src/main/resources/mapper/manage/PictureDao.xml

@@ -35,7 +35,8 @@
                 t.lasteditor,
                 t.auditor,
                 t.Status,
-                t.PicLevel
+                t.PicLevel,
+                t.jumppath
         FROM
                 picture t
         where 1=1
@@ -58,11 +59,11 @@
             and inputDate BETWEEN #{params.inputDateStart} AND #{params.inputDateEnd}
         </if>
         <choose>
-            <when test="params.pictureLevel !=null and params.pictureLevel !=''">
+            <when test="params.pictureLevel !=null ">
                 AND PicLevel = #{params.pictureLevel}
             </when>
             <otherwise>
-                AND PicLevel = 0
+                AND PicLevel > 0
             </otherwise>
         </choose>
         ORDER BY

src/main/resources/mapper/manage/PolicyDao.xml

@@ -27,7 +27,7 @@
         <result property="auditor" column="auditor"/>
     </resultMap>
     <select id="selectPolicyList" resultMap="policyMap" parameterType="io.office.modules.manage.entity.dto.PolicyParams">
-        select id,class,title,editor,lasteditor,releasedate,updatedate,auditor,status,levels from Policy
+        select id,class,title,editor,lasteditor,releasedate,updatedate,auditor,status,levels,directpath from Policy
         where 1=1
         <if test="newsParams.updateTimeStart !=null and newsParams.updateTimeEnd !=null">
             and updatedate BETWEEN #{newsParams.updateTimeStart} AND #{newsParams.updateTimeEnd}

src/main/resources/mapper/manage/TopicnewsDao.xml

@@ -27,7 +27,8 @@
         b.status,
         b.levels,
         b.releasedate,
-        b.updatedate
+        b.updatedate,
+        b.directpath
         FROM
         (select classid,newsid FROM TopIcNews  group BY classid,newsid) AS a
         LEFT JOIN news AS b ON a.newsid = b.id