Merge remote-tracking branch 'origin/master'

src/main/java/io/office/modules/manage/controller/MedicalController.java

@@ -44,7 +44,7 @@ public class MedicalController {
      */
     @RequestMapping("/info/{id}")
   //  @RequiresPermissions("manage:medical:info")
-    public R info(@PathVariable("id") Integer id){
+    public R info(@PathVariable("id") String id){
 		MedicalEntity medical = medicalService.getById(id);
 
         return R.ok().put("medical", medical);

src/main/java/io/office/modules/manage/entity/LogisticsEntity.java

@@ -31,6 +31,7 @@ public class LogisticsEntity implements Serializable {
 	 * $column.comments
 	 */
 	private String title;
+	private String oldtitle;
 	/**
 	 * $column.comments
 	 */

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

@@ -18,7 +18,7 @@ public class PolicyParams extends PageParams {
     private String keyword;
     private String status;
     private String class1;
-    private String level;
+    private String levels;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTimeStart;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")

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

@@ -31,7 +31,7 @@ public class LogisticsServiceImpl extends ServiceImpl<LogisticsDao, LogisticsEnt
         }
         IPage<LogisticsEntity> page = this.page(
                 new Query<LogisticsEntity>().getPage(params),
-                new QueryWrapper<LogisticsEntity>()
+                logisticsEntityQueryWrapper
         );
 
         return new PageUtils(page);

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 from Policy
+        select id,class,title,editor,lasteditor,releasedate,updatedate,auditor,status,levels from Policy
         where 1=1
         <if test="newsParams.updateTimeStart !=null and newsParams.updateTimeEnd !=null">
             and updatedate BETWEEN #{newsParams.updateTimeStart} AND #{newsParams.updateTimeEnd}
@@ -38,12 +38,13 @@
         <if test="newsParams.title !=null and newsParams.title !=''">
             and title like  concat('%',#{newsParams.title},'%')
         </if>
-        <if test="newsParams.status !=null">
+        <if test="newsParams.status !=null and  newsParams.status !=''">
             and status =#{newsParams.status}
         </if>
         <if test="newsParams.editor !=null and newsParams.editor !=''">
             and editor =#{newsParams.editor}
         </if>
+        and levels = #{newsParams.levels}
         ORDER BY
         id DESC
     </select>