Merge branch 'test-merge' of http://219.151.181.73:3000/zhuwei/bladex into test-merge

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java

@@ -373,7 +373,7 @@ public class ContractInfoServiceImpl extends BaseServiceImpl<ContractInfoMapper,
 
             //查询wbs同步信息
             String contractExtendSql = "select a.ancestors from m_wbs_tree_contract_extend a" +
-                    "left join m_wbs_tree_contract b where a.p_key_id = b.p_key_id and b.is_deleted = 0 and b.is_buss_show != 2" +
+                    "left join m_wbs_tree_contract b on a.p_key_id = b.p_key_id and b.is_deleted = 0 and b.is_buss_show != 2" +
                     "where a.type = " + tableOwner + " and a.is_sync = 1 and a.is_deleted = 0 and a.contract_id = " + contractId;
             Set<String> syncPKeyIds = new HashSet<>();
             List<String> strings = null;

blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java

@@ -773,7 +773,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
                 try {
                     String ancestors = jdbcTemplate.queryForObject(s,String.class);
                     String contractExtendSql = "select a.ancestors from m_wbs_tree_contract_extend a" +
-                            "left join m_wbs_tree_contract b where a.p_key_id = b.p_key_id and b.is_deleted = 0 and b.is_buss_show != 2" +
+                            "left join m_wbs_tree_contract b on a.p_key_id = b.p_key_id and b.is_deleted = 0 and b.is_buss_show != 2" +
                             "where atype = " + tableOwner + " and a.is_sync = 1 and a.is_deleted = 0 and a.ancestors like concat('" + ancestors + "','%')";
                     strings = jdbcTemplate.queryForList(contractExtendSql, String.class);
                 } catch (DataAccessException e) {