报表打印 修改短信接口

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@2661 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/controller/ServeController.java

@@ -16,8 +16,9 @@ import com.uas.platform.b2b.model.User;
 import com.uas.platform.b2b.service.EnterpriseService;
 import com.uas.platform.b2b.service.RegisterLogService;
 import com.uas.platform.b2b.service.UserService;
-import com.uas.platform.b2b.support.SendMsg;
+import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.support.TokenService;
+import com.uas.platform.core.util.SendMessageUtil;
 import com.uas.platform.core.util.StringUtil;
 
 /**
@@ -122,9 +123,9 @@ public class ServeController {
 		Long userUu = userService.findUserByUserTel(userPhone).getUserUU();
 		if (userUu != null) {
 			String code = tokenService.getEncodeToken("mobile", userUu);
-			SendMsg msg = new SendMsg();
 			try {
-				msg.sendSimpleMsg(userPhone, "【 优软科技 】验证码：" + code + "，优软商务平台找回密码。");
+				SendMessageUtil.sendMessage("验证码：" + code + "，优软商务平台找回密码。", userPhone,
+						SystemSession.getUser().getUserName(), "auth");
 			} catch (Exception e) {
 				e.printStackTrace();
 			}

src/main/java/com/uas/platform/b2b/dao/ReportConfigDao.java

@@ -12,5 +12,5 @@ public interface ReportConfigDao extends JpaRepository<ReportConfig, Long> {
 
 	public List<ReportConfig> findByEnuuAndPagename(Long enuu, String pagename);
 	
-	public List<ReportConfig> findByPagename(String pagename);
+	public List<ReportConfig> findByPagenameAndEnuuIsNull(String pagename);
 }

src/main/java/com/uas/platform/b2b/service/impl/ReportConfigServiceImpl.java

@@ -18,10 +18,10 @@ public class ReportConfigServiceImpl implements ReportConfigService {
 	@Override
 	public String getReportNameByEnuuAndPageName(Long enuu, String pagename) {
 		List<ReportConfig> configs = reportConfigDao.findByEnuuAndPagename(enuu, pagename);
-		if(configs.size() > 0) 
+		if(configs.size() > 0)
 			return configs.get(0).getReportname();
 		else{
-			configs = reportConfigDao.findByPagename(pagename);
+			configs = reportConfigDao.findByPagenameAndEnuuIsNull(pagename);
 			if(configs.size() > 0) {
 				return configs.get(0).getReportname();
 			} else {

src/main/webapp/resources/js/common/services.js

@@ -197,7 +197,7 @@ define([ 'angular', 'toaster'], function(angular) {
 					.success(function(data){
 						if(data) {
 							data = eval(data);
-							var url = 'http://report.ubtob.com/?reportfile=' + data + '&rcondition=' + condition;		
+							var url = 'http://report.ubtob.com/?reportfile=' + data + '&rcondition=' + condition+'&enuu='+enuu;		
 							window.open(url, title + '-打印', 'width=' + (window.screen.width-10) + ',height=' + (window.screen.height*0.87) + ',top=0,left=0,toolbar=no, menubar=no, scrollbars=no, resizable=no,location=no, status=no');
 						} else {
 							toaster.pop('error', '系统错误', '没有设置相应的报表');