ibizdev提交

app_web/src/widgets/sys-permission/default-drbar/default-drbar-model.ts

@@ -27,9 +27,6 @@ export default class DefaultModel {
       {
         name: 'type',
       },
-      {
-        name: 'parentpermissionid',
-      },
       {
         name: 'enable',
       },

app_web/src/widgets/sys-permission/main-grid/main-grid-model.ts

@@ -46,11 +46,6 @@ export default class MainModel {
           prop: 'permissionname',
           dataType: 'TEXT',
         },
-        {
-          name: 'p_permissionid',
-          prop: 'parentpermissionid',
-          dataType: 'PICKUP',
-        },
         {
           name: 'srfdataaccaction',
           prop: 'permissionid',

app_web/src/widgets/sys-permission/mpickup-viewpickupviewpanel-pickupviewpanel/mpickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -27,9 +27,6 @@ export default class MPickupViewpickupviewpanelModel {
       {
         name: 'type',
       },
-      {
-        name: 'parentpermissionid',
-      },
       {
         name: 'enable',
       },

app_web/src/widgets/sys-permission/pickup-viewpickupviewpanel-pickupviewpanel/pickup-viewpickupviewpanel-pickupviewpanel-model.ts

@@ -27,9 +27,6 @@ export default class PickupViewpickupviewpanelModel {
       {
         name: 'type',
       },
-      {
-        name: 'parentpermissionid',
-      },
       {
         name: 'enable',
       },

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/domain/SYS_PERMISSION.java

@@ -61,13 +61,6 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
     @JSONField(name = "type")
     @JsonProperty("type")
     private String type;
-    /**
-     * 上级资源标识
-     */
-    @TableField(value = "p_permissionid")
-    @JSONField(name = "parentpermissionid")
-    @JsonProperty("parentpermissionid")
-    private String parentpermissionid;
     /**
      * 逻辑有效
      */
@@ -94,14 +87,6 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
     @JsonProperty("updatedate")
     private Timestamp updatedate;
 
-    /**
-     * 上级
-     */
-    @JsonIgnore
-    @JSONField(serialize = false)
-    @TableField(exist = false)
-    private cn.ibizlab.core.uaa.domain.SYS_PERMISSION parentpermission;
-
 
     /**
      * 角色权限关系
@@ -133,13 +118,6 @@ public class SYS_PERMISSION extends EntityMP implements Serializable {
         this.type = type ;
         this.modify("type",type);
     }
-    /**
-     * 设置 [上级资源标识]
-     */
-    public void setParentpermissionid(String parentpermissionid){
-        this.parentpermissionid = parentpermissionid ;
-        this.modify("p_permissionid",parentpermissionid);
-    }
     /**
      * 设置 [逻辑有效]
      */

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/filter/SYS_PERMISSIONSearchContext.java

@@ -46,13 +46,6 @@ public class SYS_PERMISSIONSearchContext extends QueryWrapperContext<SYS_PERMISS
         if(!ObjectUtils.isEmpty(this.n_type_eq)){
             this.getSelectCond().eq("type", n_type_eq);
         }
-    }
-	private String n_p_permissionid_eq;//[上级资源标识]
-	public void setN_p_permissionid_eq(String n_p_permissionid_eq) {
-        this.n_p_permissionid_eq = n_p_permissionid_eq;
-        if(!ObjectUtils.isEmpty(this.n_p_permissionid_eq)){
-            this.getSelectCond().eq("p_permissionid", n_p_permissionid_eq);
-        }
     }
 	private Integer n_enable_eq;//[逻辑有效]
 	public void setN_enable_eq(Integer n_enable_eq) {

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/mapper/SYS_PERMISSIONMapper.java

@@ -59,6 +59,4 @@ public interface SYS_PERMISSIONMapper extends BaseMapper<SYS_PERMISSION>{
     @Delete("${sql}")
     boolean deleteBySQL(@Param("sql") String sql);
 
-    List<SYS_PERMISSION> selectByParentpermissionid(@Param("permissionid") Serializable permissionid) ;
-
 }

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/ISYS_PERMISSIONService.java

@@ -37,9 +37,6 @@ public interface ISYS_PERMISSIONService extends IService<SYS_PERMISSION>{
     SYS_PERMISSION get(String key) ;
     Page<SYS_PERMISSION> searchDefault(SYS_PERMISSIONSearchContext context) ;
 
-    List<SYS_PERMISSION> selectByParentpermissionid(String permissionid) ;
-    void removeByParentpermissionid(String permissionid) ;
-
 
 
     List<JSONObject> select(String sql);

ibzuaa-core/src/main/java/cn/ibizlab/core/uaa/service/impl/SYS_PERMISSIONServiceImpl.java

@@ -42,9 +42,6 @@ import com.alibaba.fastjson.JSONObject;
 @Service
 public class SYS_PERMISSIONServiceImpl extends ServiceImpl<SYS_PERMISSIONMapper, SYS_PERMISSION> implements ISYS_PERMISSIONService {
 
-    @Autowired
-    @Lazy
-    private cn.ibizlab.core.uaa.service.ISYS_PERMISSIONService sysPermissionService;
     @Autowired
     @Lazy
     private cn.ibizlab.core.uaa.service.ISYS_ROLE_PERMISSIONService sysRolePermissionService;
@@ -143,16 +140,6 @@ public class SYS_PERMISSIONServiceImpl extends ServiceImpl<SYS_PERMISSIONMapper,
     }
 
 
-	@Override
-    public List<SYS_PERMISSION> selectByParentpermissionid(String permissionid) {
-        return baseMapper.selectByParentpermissionid(permissionid);
-    }
-
-    @Override
-    public void removeByParentpermissionid(String permissionid) {
-        this.remove(new QueryWrapper<SYS_PERMISSION>().eq("sys_permissionid",permissionid));
-    }
-
 
     /**
      * 查询集合 DEFAULT

ibzuaa-core/src/main/resources/liquibase/h2_table.xml

@@ -123,8 +123,6 @@
                 </column>
                 <column name="TYPE" remarks="" type="VARCHAR(60)">
                 </column>
-                <column name="P_PERMISSIONID" remarks="" type="VARCHAR(200)">
-                </column>
                 <column name="ENABLE" remarks="" type="INT">
                 </column>
                 <column name="CREATEDATE" remarks="" type="DATETIME">
@@ -179,9 +177,6 @@
     </changeSet>
         <!--输出实体[SYS_ROLE]外键关系 -->
         <!--输出实体[SYS_PERMISSION]外键关系 -->
-    <changeSet author="a_A_5d9d78509" id="fk-sys_permission-30-12">
-       <addForeignKeyConstraint baseColumnNames="P_PERMISSIONID" baseTableName="IBZPERMISSION" constraintName="DER1N_SYS_PERMISSION_SYS_PERMI" deferrable="false" initiallyDeferred="false" onDelete="RESTRICT" onUpdate="RESTRICT" referencedColumnNames="SYS_PERMISSIONID" referencedTableName="IBZPERMISSION" validate="true"/>
-    </changeSet>
         <!--输出实体[SYS_PSAPPMENUITEM]外键关系 -->
 
 </databaseChangeLog>

ibzuaa-core/src/main/resources/mapper/uaa/sys_permission/SYS_PERMISSIONMapper.xml

@@ -10,20 +10,10 @@
         <id property="permissionid" column="sys_permissionid" /><!--主键字段映射-->
 		<result property="permissionname" column="sys_permissionname" />
 		<result property="pssystemid" column="systemid" />
-		<result property="parentpermissionid" column="p_permissionid" />
             
 		
-		<!--通过mybatis自动注入关系属性[主实体]，fetchType="lazy"为懒加载配置 -->
-		<association property="parentpermission" javaType="cn.ibizlab.core.uaa.domain.SYS_PERMISSION" column="p_permissionid" select="cn.ibizlab.core.uaa.mapper.SYS_PERMISSIONMapper.selectById" fetchType="lazy"></association>
     </resultMap>
 
-	<!--关系实体暴露select方法供主实体通过外键查询关系实体数据[实体关系名称:DER1N_SYS_PERMISSION_SYS_PERMISSION_P_PERMISSIONID] -->
-	 <select id="selectByParentpermissionid" resultMap="SYS_PERMISSIONResultMap">
-         select t1.* from (
-                <include refid="Default" />
-         ) t1
-         where  p_permissionid=#{permissionid}
-     </select>
 
     <!--数据集合[Default]-->
 	 <select id="searchDefault"  parameterType="cn.ibizlab.core.uaa.filter.SYS_PERMISSIONSearchContext"  resultMap="SYS_PERMISSIONResultMap">
@@ -36,7 +26,7 @@
 
     <!--数据查询[Default]-->
     <sql id="Default" databaseId="mysql">
-       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`P_PERMISSIONID`, t1.`SYSTEMID`, t1.`SYS_PERMISSIONID`, t1.`SYS_PERMISSIONNAME`, t1.`TYPE`, t1.`UPDATEDATE` FROM `IBZPERMISSION` t1  
+       <![CDATA[	SELECT t1.`CREATEDATE`, t1.`ENABLE`, t1.`SYSTEMID`, t1.`SYS_PERMISSIONID`, t1.`SYS_PERMISSIONNAME`, t1.`TYPE`, t1.`UPDATEDATE` FROM `IBZPERMISSION` t1  
 			]]>
     </sql>
 

ibzuaa-provider/ibzuaa-provider-uaaapi/src/main/java/cn/ibizlab/uaaapi/dto/SYS_PERMISSIONDTO.java

@@ -55,14 +55,6 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
     @JsonProperty("type")
     private String type;
 
-    /**
-     * 属性 [P_PERMISSIONID]
-     *
-     */
-    @JSONField(name = "parentpermissionid")
-    @JsonProperty("parentpermissionid")
-    private String parentpermissionid;
-
     /**
      * 属性 [ENABLE]
      *
@@ -114,14 +106,6 @@ public class SYS_PERMISSIONDTO extends DTOBase implements Serializable {
         this.modify("type",type);
     }
 
-    /**
-     * 设置 [P_PERMISSIONID]
-     */
-    public void setParentpermissionid(String  parentpermissionid){
-        this.parentpermissionid = parentpermissionid ;
-        this.modify("p_permissionid",parentpermissionid);
-    }
-
     /**
      * 设置 [ENABLE]
      */