Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-server-mdm

src/main/java/com/dk/mdm/mapper/mst/RoleMapper.xml

@@ -196,6 +196,9 @@
             cp_id,
             op_app_code,
             sys_code,
+            flg_nolimit_fun,
+            flg_nolimit_pvw,
+            flg_nolimit_sen,
             op_create_user_id,
         </trim>
         )
@@ -211,6 +214,9 @@
                 #{item.cpId},
                 #{item.opAppCode},
                 #{item.sysCode},
+                #{item.flgNolimitFun},
+                #{item.flgNolimitPvw},
+                #{item.flgNolimitSen},
                 #{item.opCreateUserId}::uuid,
             </trim>
             )

src/main/java/com/dk/mdm/mapper/sale/OrderMapper.xml

@@ -769,7 +769,10 @@
                t.make_staff,
                makestaff.staff_name                              as "makeStaffName",
                t.make_time,
-               t.cp_id
+               t.cp_id,
+               t.discount,
+               t.fact_amt,
+               t.disc_amt
         FROM dkic_b.t_psi_order as t
                  left join dkic_b.t_mst_sale_channel tmsc on t.sales_channel = tmsc.channel_id
                  left join dkic_b.t_mst_org tmo on t.org_id = tmo.org_id

src/main/java/com/dk/mdm/service/mst/StaffService.java

@@ -335,6 +335,12 @@ public class StaffService extends BaseService<Staff> {
             role.setDisplayNo((Integer) m.get("displayNo"));
             role.setCpId(cpId);
             role.setOpCreateUserId(staffId);
+            // 标准版 不限制权限
+            if (Constant.STD.equals(gradeCode)) {
+                role.setFlgNolimitFun(true);
+                role.setFlgNolimitPvw(true);
+                role.setFlgNolimitSen(true);
+            }
             listR.add(role);
         }
         roleMapper.insertBatch(listR);