diff --git a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/AddPerformRecordDto.java b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/AddPerformRecordDto.java
index eac2d8d..a1735af 100644
--- a/inventory-dao/src/main/java/com/rzyc/bean/user/dto/AddPerformRecordDto.java
+++ b/inventory-dao/src/main/java/com/rzyc/bean/user/dto/AddPerformRecordDto.java
@@ -27,11 +27,11 @@ public class AddPerformRecordDto {
 
     @NotNull(message = "开始时间不能为空")
     @ApiModelProperty(value = "开始时间 yyyy-MM-dd",required = true)
-    private String startTime;
+    private String starttime;
 
     @NotNull(message = "结束时间不能为空")
     @ApiModelProperty(value = "结束时间 yyyy-MM-dd",required = true)
-    private String endTime;
+    private String endtime;
 
     @NotNull(message = "工作内容不能为空")
     @ApiModelProperty(value = "工作内容",required = true)
@@ -72,20 +72,20 @@ public class AddPerformRecordDto {
         this.worktitle = worktitle;
     }
 
-    public String getStartTime() {
-        return startTime;
+    public String getStarttime() {
+        return starttime;
     }
 
-    public void setStartTime(String startTime) {
-        this.startTime = startTime;
+    public void setStarttime(String starttime) {
+        this.starttime = starttime;
     }
 
-    public String getEndTime() {
-        return endTime;
+    public String getEndtime() {
+        return endtime;
     }
 
-    public void setEndTime(String endTime) {
-        this.endTime = endTime;
+    public void setEndtime(String endtime) {
+        this.endtime = endtime;
     }
 
     public String getWorkcnt() {
diff --git a/inventory-dao/src/main/resources/mapper/NewsCntMapper.xml b/inventory-dao/src/main/resources/mapper/NewsCntMapper.xml
index e586007..2fe5d94 100644
--- a/inventory-dao/src/main/resources/mapper/NewsCntMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/NewsCntMapper.xml
@@ -594,7 +594,7 @@
       nc.CreatedOn, nc.CreatedBy, nc.ModifiedOn, nc.ModifiedBy,nc.PublicTime
     FROM NewsCnt nc
            LEFT JOIN NewsClass nl ON nc.`NewsClassId` = nl.`NewsClassId`
-    WHERE nc.`NewTitle` LIKE #{‘}
+    WHERE nc.`NewTitle` LIKE #{condition}
       AND nc.`NewsClassId` IS NOT NULL
     <if test="null != newsClassId and '' != newsClassId">
       AND nc.`NewsClassId` = #{newsClassId}
diff --git a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
index 7c10a1f..79e8c92 100644
--- a/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/ent/BaseInClassMapper.xml
@@ -396,7 +396,6 @@
     FROM `BaseInClass` bc
         LEFT JOIN BaseInClass sp ON bc.`SuperInId` = sp.`BaseInClassId`
     WHERE bc.`IndustryClassName` LIKE #{condition}
-    and bc.in_type = #{inType}
     ORDER BY bc.`IndustryClassName` ASC
   </select>
 
diff --git a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
index a77befc..bc126e6 100644
--- a/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
+++ b/inventory-gov/src/main/java/com/rzyc/controller/PcPersonalController.java
@@ -33,6 +33,8 @@ import com.rzyc.model.personal.SysResource;
 import com.rzyc.model.user.*;
 import io.swagger.annotations.*;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.ConvertUtils;
+import org.apache.commons.beanutils.converters.DateConverter;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -80,7 +82,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
             SysUser sysUser = sysUserMapper.findBySysUserName(sysusername);
 
             //登录的是政府用户
-            if(null != sysUser && StringUtils.isNotBlank(sysUser.getUsertype()) && sysUser.getUsertype().equals("政府用户") & sysUser.getManageState() == IsManage.GOVERNMENT.getState()){
+            if(null != sysUser && StringUtils.isNotBlank(sysUser.getUsertype()) && sysUser.getUsertype().equals("政府用户")){
                 String ps = PasswdFactory.encryptPasswd(sysUser.getSysuserid(), sysusername, syspassword);
                 System.out.println("========" + ps);
                 if(sysUser.getSyspassword().equals(ps)){
@@ -449,7 +451,7 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         if(null != sysUser){
 
             //更新履职进度
-            getFactor(sysUser.getSystitle());
+//            getFactor(sysUser.getSystitle());
 
 
             UserDepart userDepart = listPerformMapper.userPerform(sysUser.getSysuserid());
@@ -1050,11 +1052,17 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
     public SingleResult<String> addPerformRecord(@Valid @RequestBody AddPerformRecordDto addPerformRecordDto)throws Exception{
         SingleResult<String> result = new SingleResult<>();
         ListDetailWithBLOBs listDetail = new ListDetailWithBLOBs();
+
+        DateConverter converter = new DateConverter();
+        converter.setPattern(new String("yyyy-MM-dd"));
+        ConvertUtils.register(converter, Date.class);
+
+
         BeanUtils.copyProperties(listDetail,addPerformRecordDto);
 
         //处理时间
-        listDetail.setStarttime(DateUtils.parseString2Date(addPerformRecordDto.getStartTime(),"yyyy-MM-dd"));
-        listDetail.setEndtime(DateUtils.parseString2Date(addPerformRecordDto.getEndTime(),"yyyy-MM-dd"));
+        listDetail.setStarttime(DateUtils.parseString2Date(addPerformRecordDto.getStarttime(),"yyyy-MM-dd"));
+        listDetail.setEndtime(DateUtils.parseString2Date(addPerformRecordDto.getEndtime(),"yyyy-MM-dd"));
         listDetail.setFinishtime(listDetail.getEndtime());
 
         String chinaName = getChinaName();
@@ -1128,8 +1136,8 @@ public class PcPersonalController extends com.rzyc.controller.BaseController {
         BeanUtils.copyProperties(listDetail,addPerformRecordDto);
 
         //处理时间
-        listDetail.setStarttime(DateUtils.parseString2Date(addPerformRecordDto.getStartTime(),"yyyy-MM-dd"));
-        listDetail.setEndtime(DateUtils.parseString2Date(addPerformRecordDto.getEndTime(),"yyyy-MM-dd"));
+        listDetail.setStarttime(DateUtils.parseString2Date(addPerformRecordDto.getStarttime(),"yyyy-MM-dd"));
+        listDetail.setEndtime(DateUtils.parseString2Date(addPerformRecordDto.getEndtime(),"yyyy-MM-dd"));
         listDetail.setFinishtime(listDetail.getEndtime());
 
         String chinaName = getChinaName();