Antiloveg 8 years ago
parent
commit
359842984e

+ 3 - 3
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -928,10 +928,10 @@ public class CognizanceApiController extends CertifyApiController {
 	public Result downloadRatepay(HttpServletResponse response, String sign, String id) {
 		Result res = new Result();
 
-		User curUser = TokenManager.getUserToken();
+		/*User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;
-		}
+		}*/
 
 		if (StringUtils.isEmpty(id)) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
@@ -939,7 +939,7 @@ public class CognizanceApiController extends CertifyApiController {
 		}
 
 		OrgRatepay ratepay = orgRatepayService.selectByPrimaryKey(id);
-		if (ratepay == null || !curUser.getId().equals(ratepay.getUid())) {
+		if (ratepay == null || TokenManager.getUserId().equals(ratepay.getUid())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "企业纳税申报id"));
 			return res;
 		}

+ 4 - 4
src/main/java/com/goafanti/common/mapper/AchievementMapper.xml

@@ -671,7 +671,7 @@
 		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  a.name = #{name,jdbcType=VARCHAR}
+		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -721,7 +721,7 @@
 		and  audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  name = #{name,jdbcType=VARCHAR}
+		and  name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -774,7 +774,7 @@
 		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  a.name = #{name,jdbcType=VARCHAR}
+		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -824,7 +824,7 @@
 		and  a.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  a.name = #{name,jdbcType=VARCHAR}
+		and  a.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  a.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"

+ 6 - 6
src/main/java/com/goafanti/common/mapper/DemandMapper.xml

@@ -504,7 +504,7 @@
 		and  d.serial_number = #{serialNumber,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -574,7 +574,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -646,7 +646,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -716,7 +716,7 @@
 		and  oi.licence_province = #{province,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -825,7 +825,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"
@@ -869,7 +869,7 @@
 		and  d.audit_status = #{auditStatus,jdbcType=INTEGER}
 	</if>
 	<if test="name != null">
-		and  d.name = #{name,jdbcType=VARCHAR}
+		and  d.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="keyword != null">
 		and  d.keyword like "%"#{keyword,jdbcType=VARCHAR}"%"