|
|
@ -19,6 +19,7 @@ import com.yihu.jw.utils.hibernate.HibenateUtils;
|
|
|
import jdk.nashorn.internal.ir.IfNode;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@ -48,6 +49,8 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
|
|
|
private WlyyHospitalSysDictDao hospitalSysDictDao;
|
|
|
@Autowired
|
|
|
private UserDao userDao;
|
|
|
@Value("${wechat.id}")
|
|
|
private String wechatId;
|
|
|
|
|
|
/**
|
|
|
* 创建和修改应用角色
|
|
|
@ -107,6 +110,12 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
|
|
|
*/
|
|
|
public MixEnvelop selectByCondition(String type, String saasId, String orgCode, String name, Integer status, Integer page, Integer size){
|
|
|
MixEnvelop mixEnvelop = new MixEnvelop();
|
|
|
String conditionSql = "";
|
|
|
if ("xm_ykyy_wx".equals(wechatId)) {
|
|
|
conditionSql = "to_char(m.update_time,'YYYY-MM-DD hh24:mi:ss') AS \"updateTime\",";
|
|
|
} else {
|
|
|
conditionSql = "date_format(m.update_time,'%Y-%m-%d %H:%i:%S' ) AS \"updateTime\",";
|
|
|
}
|
|
|
String sql = "SELECT\n" +
|
|
|
"\tm.id,\n" +
|
|
|
"\tm.saas_id AS \"saasId\",\n" +
|
|
|
@ -116,7 +125,7 @@ public class BaseApplicationRoleDictService extends BaseJpaService<BaseApplicati
|
|
|
"\tm.type AS \"type\",\n" +
|
|
|
"\tm.name AS \"name\",\n" +
|
|
|
"\tm.STATUS AS \"status\",\n" +
|
|
|
"\tm.update_time AS \"updateTime\",\n" +
|
|
|
conditionSql +
|
|
|
"\tm.update_user_name AS \"updateUserName\"\n" +
|
|
|
"FROM\n" +
|
|
|
"\tbase_application_role_dict m\n" +
|
wangzhinan