Browse Source

Merge remote-tracking branch 'origin/test' into dev

anderx 7 years ago
parent
commit
57b8d89ddc

+ 1 - 1
src/main/java/com/goafanti/common/mapper/ContractTaskLogMapper.xml

@@ -286,7 +286,7 @@
   <update id="updateDimissionTransfer" parameterType="java.lang.String">
     update contract_task_log
     set 
-      task_receiver = #{transferId,jdbcType=VARCHAR},
+      task_receiver = #{transferId,jdbcType=VARCHAR}
     where task_receiver = #{aid,jdbcType=VARCHAR}
   </update>
   

+ 0 - 1
src/main/java/com/goafanti/permission/service/impl/NewRoleServiceImpl.java

@@ -188,7 +188,6 @@ public class NewRoleServiceImpl extends BaseMybatisDao<RoleMapper> implements Ne
 				roleResourcesMapper.updateLockRelease("1",aid,transferId);//将业务锁转给指定人
 			}
 			if (s==roleResources.XMRW.getCode()) {
-				
 				contractTaskLogMapper.updateDimissionTransfer(aid,transferId);
 			}
 			if (s!=roleResources.QDYW.getCode()) {