yingp 5 years ago
parent
commit
eb8e76e717

+ 0 - 8
uas-office-core/src/main/java/com/usoftchina/uas/office/service/AbstractService.java

@@ -1,9 +1,6 @@
 package com.usoftchina.uas.office.service;
 
 import com.alibaba.fastjson.JSON;
-import com.usoftchina.uas.office.context.MasterHolder;
-import com.usoftchina.uas.office.jdbc.DataSourceHolder;
-import com.usoftchina.uas.office.jdbc.DynamicDataSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -53,11 +50,6 @@ public abstract class AbstractService {
 
     protected <T> T queryForBean(String statement, Class<T> targetCls, Object... arguments) {
         try {
-            try {
-                logger.debug(((DynamicDataSource)jdbcTemplate.getDataSource()).lookupSchema());
-                logger.debug(String.valueOf(DataSourceHolder.get()));
-            } catch (Exception e) {
-            }
             return jdbcTemplate.queryForObject(statement, new BeanPropertyRowMapper<>(targetCls), arguments);
         } catch (EmptyResultDataAccessException e) {
             return null;

+ 2 - 1
uas-office-qywx/src/main/java/com/usoftchina/uas/office/qywx/service/UasJProcessService.java

@@ -1,5 +1,6 @@
 package com.usoftchina.uas.office.qywx.service;
 
+import com.usoftchina.uas.office.context.MasterHolder;
 import com.usoftchina.uas.office.qywx.entity.JProcess;
 import com.usoftchina.uas.office.service.AbstractService;
 import org.springframework.stereotype.Service;
@@ -12,6 +13,6 @@ import org.springframework.stereotype.Service;
 public class UasJProcessService extends AbstractService {
 
     public JProcess getById(Integer id) {
-        return queryForBean("select * from JProcess where jp_id=?", JProcess.class, id);
+        return queryForBean("select * from " + MasterHolder.get().username() + ".JProcess where jp_id=?", JProcess.class, id);
     }
 }