|
|
@@ -10,7 +10,6 @@ import common.YosException;
|
|
|
import common.data.InsertSQL;
|
|
|
import common.data.Rows;
|
|
|
import common.data.SQLFactory;
|
|
|
-
|
|
|
import common.websocket.WebSocket;
|
|
|
import org.apache.commons.lang.StringUtils;
|
|
|
import utility.email.Email;
|
|
|
@@ -483,9 +482,9 @@ public class Remind {
|
|
|
if (emailContent == null) {
|
|
|
EmailContent content = new EmailContent();
|
|
|
content.addText(this.content);
|
|
|
- email.send(siteid, content);
|
|
|
+ email.send(content);
|
|
|
} else {
|
|
|
- email.send(siteid, emailContent);
|
|
|
+ email.send(emailContent);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
|
@@ -503,7 +502,7 @@ public class Remind {
|
|
|
}
|
|
|
for (String phonenumber : tophonenumber) {
|
|
|
Sms sms = new Sms();
|
|
|
- sms.sendout(Sms.SmsType.PassWord,siteid, phonenumber, content);
|
|
|
+ sms.sendout(Sms.SmsType.PassWord, siteid, phonenumber, content);
|
|
|
}
|
|
|
return this;
|
|
|
}
|
|
|
@@ -520,7 +519,7 @@ public class Remind {
|
|
|
}
|
|
|
String systemclient = Parameter.getString(siteid, "workwechatsystemclient");
|
|
|
// SQLFactory sqlFactory = new SQLFactory("sql:select accountno from sys_workwechataccount where siteid='" + siteid + "',systemclient='" + systemclient + "' and userid in $userids$");
|
|
|
- SQLFactory sqlFactory = new SQLFactory(new Remind(),"获取hrcode");
|
|
|
+ SQLFactory sqlFactory = new SQLFactory(new Remind(), "获取hrcode");
|
|
|
sqlFactory.addParameter_in("userids", touserid);
|
|
|
// ArrayList<String> users = this.controller.dbConnect.runSqlQuery(sqlFactory.getSQL()).toArrayList("accountno");
|
|
|
ArrayList<String> users = this.controller.dbConnect.runSqlQuery(sqlFactory.getSQL()).toArrayList("hrcode");
|
|
|
@@ -572,7 +571,7 @@ public class Remind {
|
|
|
return;
|
|
|
}
|
|
|
for (Long userid : touserid) {
|
|
|
- InsertSQL insertSQL = SQLFactory.createInsertSQL(controller,"sys_message");
|
|
|
+ InsertSQL insertSQL = SQLFactory.createInsertSQL(controller, "sys_message");
|
|
|
insertSQL.setUniqueid(controller.createTableID("sys_message"));
|
|
|
insertSQL.setSiteid(siteid);
|
|
|
insertSQL.setValue("title", title);
|
|
|
@@ -582,7 +581,7 @@ public class Remind {
|
|
|
insertSQL.setValue("systemappids", systemappids);
|
|
|
insertSQL.setValue("objectid", objectid == 0 ? "null" : objectid);
|
|
|
insertSQL.setValue("objectname", objectname);
|
|
|
- insertSQL.setValue("isread",0);
|
|
|
+ insertSQL.setValue("isread", 0);
|
|
|
insertSQL.insert();
|
|
|
}
|
|
|
}
|