Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservice...

zhaoxiaohao

2020-10-09 c8cf2b93d1af092700e0b847c80dca9a2cfa6d92

Merge branch 'pay_master' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into pay_master

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ConsumptionRecordServiceImpl.java

@@ -759,7 +759,7 @@
        if (payManager == null) {
            return false;
        } else {
            return payManager.getId() > 0;
            return payManager.getId()!=null;
        }
    }


 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -326,16 +326,14 @@
        Page<SysUser> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
        List<SysUser> list = baseMapper.findList(page, params);
        long total = page.getTotal();
        if (total > 0) {
        if (total > 0&&list.size()>0) {
            List<Long> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());

            if (userIds.size()>0) {
            List<SysRole> sysRoles = roleUserService.findRolesByUserIds(userIds);

//            Map<String, Object> map = new HashMap<String, Object>();
//            List<SysOrganization> sysOrganizationList=organizationService.fin();
            list.forEach(u -> u.setRoles(sysRoles.stream().filter(r -> !ObjectUtils.notEqual(u.getId(), r.getUserId()))
                    .collect(Collectors.toList())));
        }
        }
        return PageResult.<SysUser>builder().data(list).code(0).count(total).build();
    }


 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -6,7 +6,7 @@
        <where>
            t.is_del=0
            <if test="u.id != null and u.id != ''">
                and t.id like concat('%', #{u.id}, '%')
                and t.id = #{u.id}
            </if>
            <if test="u.username != null and u.username != ''">
                and t.username like concat('%', #{u.username}, '%')

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html

@@ -462,6 +462,7 @@
                        element.code == "dev_admin" ||
                        element.code == "pc_admin" ||
                        element.code == "oprationmanager" ||
                        element.code == "salemanager" ||
                        element.code == "dev_user" ||
                        element.code == "shop_admin" ||
                        element.code == "app_admin") {
@@ -563,6 +564,27 @@
                    }
                }
            }
            else
            {
                $("#h_hospital").html(noData);
                //用户反馈
                $("#u_feedback").html(noData);
                //数据需求
                $("#d_dataneed").html(noData);
                //H端医生
                $("#h_doctor").html(noData);
                //C端医生
                $("#c_doctor").html(noData);
                //签约医生
                $("#u_signing").html(noData);
                //医答医生
                $("#d_isanswer").html(noData);
                //待审核医生
                $("#ht_doctor").html(noData);
                $("#u_product").html(noData);
                $("#t_product").html(noData);
                layer.closeAll('loading');
            }
        });
    </script>
</body>

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html

@@ -41,8 +41,7 @@
        <div class="layui-form-item">
            <label class="layui-form-label">需求类型</label>
            <div class="layui-input-block">
                <input name="needType" placeholder="请输入应用标识" type="text" class="layui-input" maxlength="20"
                       lay-verify="required" required/>
                <input name="needTypeName" id="needTypeName" placeholder="请输入应用标识" type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
@@ -61,31 +60,31 @@
        <div class="layui-form-item">
            <label class="layui-form-label">科室名称</label>
            <div class="layui-input-block">
                <input name="departmentName" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
                <input name="departmentName"  type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">医生联系方式</label>
            <div class="layui-input-block">
                <input name="doctorTel" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
                <input name="doctorTel"  type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">需求数据的开始时间</label>
            <div class="layui-input-block">
                <input name="needBegintime" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
                <input name="needBegintime"  type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">需求数据的结束时间</label>
            <div class="layui-input-block">
                <input name="needEndtime" placeholder="请输入回调地址" type="text" class="layui-input" maxlength="20"/>
                <input name="needEndtime"  type="text" class="layui-input" maxlength="20"/>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">需求标签</label>
            <div class="layui-input-block">
                <textarea name="needTags" placeholder="请输入回调地址" class="layui-input" style="height:200px;overflow:auto" maxlength="20"> </textarea>
                <textarea name="needTags"  class="layui-input" style="height:200px;overflow:auto" maxlength="20"> </textarea>
            </div>
        </div>
        <div class="layui-form-item model-form-footer">
@@ -290,8 +289,8 @@
            layer.open({
                type: 1,
                title: '详情',
                area: '450px',
                offset: '120px',
                area: '700px',
                offset: '0px',
                content: $('#app-model').html(),
                success: function () {
                    $('#app-form')[0].reset();
@@ -309,6 +308,13 @@
                        $("input[name='clientId']").attr('class', "layui-input layui-disabled");
                        $("input[name='webServerRedirectUri']").attr('disabled', true);
                        $("input[name='webServerRedirectUri']").attr('class', "layui-input layui-disabled");
                        if(data.needType===1)
                        {
                            $("#needTypeName").val("筛查");
                        }
                        else{
                            $("#needTypeName").val("就诊");
                        }
                        form.val('app-form', data);
                        $('#app-form').find('input,textarea').prop('readonly', true);
                        $('#app-form').attr('method', 'POST');