用户角色修改

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -1485,12 +1485,11 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
    public MixEnvelop getSumAmount(String belongCommunity, String equNum, String startTime, String endTime) {
        List<Map<String,Object>> arrayList=new ArrayList<>();
        List<Map<String,Object>> mapList=new ArrayList<>();
        Map<String,Object> map = new HashMap<>();
        Iterable <Mediicinedevice> mediicinedevices = deviceDao.findAll();
        List<Mediicinedevice> mediicinedeviceList= IterableUtils.toList(mediicinedevices);
        for (Mediicinedevice mediicinedevice:mediicinedeviceList){
            String sql = "SELECT SUM(t.amount) AS sumAmount,\n" +
                    "a.community AS community,\n" +
                    "a.equ_name AS equName,\n" +
                    "COUNT(*) AS count,\n" +
                    "t.shipping_equ AS equNum \n" +
                    "FROM t_mediicine_order AS t,\n" +

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -975,15 +975,15 @@ public class UserService extends BaseJpaService<UserDO, UserDao> {
                if(!saasidValue.equals(null) && !saasidValue.equals("")){
                    finalSql = finalSql + " and saas. id = '"+saasidValue+"'";
                }
                if(!roleIdValue.equals(null) && !roleIdValue.equals("")){
                    finalSql = finalSql + " and usr .role_id = '"+roleIdValue+"'";
                }
//                if(!roleIdValue.equals(null) && !roleIdValue.equals("")){
//                    finalSql = finalSql + " and usr .role_id = '"+roleIdValue+"'";
//                }
                finalSql = finalSql + " ORDER BY usr .create_time DESC";
        Logger.getAnonymousLogger().info("finalSql="+finalSql);
        String sql = finalSql
                .replace("{realName}","%" + realName + "%")
                .replace("{saasid}",saasidValue)
                .replace("{roleId}",roleIdValue);
                .replace("{saasid}",saasidValue);
//                .replace("{roleId}",roleIdValue);
        List<Map<String, Object>> list=null;
        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){