Merge branch 'dev-mobh' into develop

src/main/java/cn/timer/api/controller/LoginController.java

@@ -821,7 +821,7 @@ public class LoginController {
 
 		}
 		YgglMainEmp userInfo = ygglMainEmpMapper.selectOne(new QueryWrapper<YgglMainEmp>().lambda()
-				.select(YgglMainEmp::getName, YgglMainEmp::getPhone, YgglMainEmp::getBmgwId)
+				.select(YgglMainEmp::getEmpNum, YgglMainEmp::getName, YgglMainEmp::getPhone, YgglMainEmp::getBmgwId, YgglMainEmp::getOrgCode)
 				.eq(YgglMainEmp::getEmpNum, qyzxEmpLogin1.getId())
 				.eq(YgglMainEmp::getOrgCode, qyzxEmpLogin1.getOrgId()));
 		if (userInfo == null) {

src/main/java/cn/timer/api/controller/admin/AdminAssoTxjlbcontroller.java

@@ -6,6 +6,7 @@ import javax.annotation.Resource;
 import javax.transaction.Transactional;
 
 import cn.timer.api.dao.admin.AdminAssoTxjlbMapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -66,7 +67,9 @@ public class AdminAssoTxjlbcontroller {
 	@ApiOperation(value = "未读记录标记已读", httpMethod = "GET", notes = "接口发布说明")
 	public Result<Object> recordmodification(@CurrentUser UserBean userBean, @PathVariable Integer id) {
 		AdminAssoTxjlb.builder().id(id).build()
-				.update(new QueryWrapper<AdminAssoTxjlb>().lambda().eq(AdminAssoTxjlb::getTxstate, 1));
+				.update(new UpdateWrapper<AdminAssoTxjlb>().lambda().set(AdminAssoTxjlb::getTxstate, 1)
+						.eq(AdminAssoTxjlb::getId, id)
+				);
 		
 		return ResultUtil.success("修改成功");
 	}

src/main/resources/mapping/admin/AdminAssoTxjlbMapper.xml

@@ -37,6 +37,9 @@
             <if test="param.txstate != null">
                 and txjlb.txstate = #{param.txstate}
             </if>
+            <if test="param.empNum != null">
+                and txjlb.emp_num = #{param.empNum}
+            </if>
             <if test="param.orgCode != null">
                 and txjlb.org_code = #{param.orgCode}
             </if>