apps status and ExtendAttr

maxkey-persistence/src/main/java/org/maxkey/persistence/mapper/AppsMapper.java

@@ -37,7 +37,7 @@ public  interface AppsMapper extends IJpaBaseMapper<Apps> {
 	
 	public int updateApp(Apps app);
 	
-	@Update("update mxk_apps set isextendattr=#{isExtendAttr},	extendattr=#{extendAttr} where id = #{id}")
+	@Update("update mxk_apps set extendattr=#{extendAttr} where id = #{id}")
 	public int updateExtendAttr(Apps app);  
 	
 

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsCasDetailsMapper.xml

@@ -8,7 +8,6 @@
     		mxk_apps_cas_details cd,
     		mxk_apps app
     	where 	app.instid = cd.instid
-    		and app.status	=	1
     		and cd.id	=	app.id
     		and (
     			app.id	=	#{value}

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsFormBasedDetailsMapper.xml

@@ -12,6 +12,5 @@
     		and app.id	=	#{value}
     		and fbd.id	=	#{value}
     		and fbd.id	=	app.id
-    		and status	=	1
     </select>
 </mapper>

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsJwtDetailsMapper.xml

@@ -11,7 +11,6 @@
     	where 	app.instid  =   jd.instid
     		and app.id	    =	#{value}
     		and jd.id	    =	#{value}
-    		and status        =   1
     		and jd.id	    =	app.id
     </select>
 	

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsMapper.xml

@@ -143,8 +143,9 @@
 			sharedusername		=	#{sharedUsername},
 			sharedpassword		=	#{sharedPassword},
 			systemuserattr		=	#{systemUserAttr},
-			<!--
+			
 			isextendattr		=	#{isExtendAttr},
+			<!--
 			extendattr			=	#{extendAttr},
 			-->
 			userpropertys		=	#{userPropertys},
@@ -184,21 +185,26 @@
             and p.instid = #{instId}
             and r.instid = #{instId}
             and app.visible != 0
-            and (
-            	 r.id='ROLE_ALL_USER'
-                 or r.id in(
-                      select 
-                        rm.roleid 
-                      from 
-                        mxk_role_member rm,mxk_userinfo u 
-                      where rm.memberid    =   u.id 
-                        <if test="userId != null and userId != ''">
-                            and u.id        =   #{userId}
-                        </if>
-                        <if test="username != null and username != ''">
-                            and  u.username =   #{username}
-                        </if>
-                    )
+            and r.id in(
+                    <!-- ROLE_ALL_USER -->
+                    select id as roleid 
+                    from mxk_roles 
+                    where rolecode = 'ROLE_ALL_USER'
+                    
+                    union 
+                    
+                    <!-- role member -->
+                    select 
+                      rm.roleid 
+                    from 
+                      mxk_role_member rm,mxk_userinfo u 
+                    where rm.memberid    =   u.id 
+                      <if test="userId != null and userId != ''">
+                          and u.id        =   #{userId}
+                      </if>
+                      <if test="username != null and username != ''">
+                          and  u.username =   #{username}
+                      </if>
             )
         <if test="appName != null and appName != ''">
             and appname    =   #{appName}

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsSaml20DetailsMapper.xml

@@ -28,7 +28,6 @@
     		and app.id		=	#{value}
     		and svd.id		=	#{value}
     		and svd.id		=	app.id
-    		and app.status	=	1
     </select>
     
 </mapper>

maxkey-persistence/src/main/resources/org/maxkey/persistence/mapper/xml/mysql/AppsTokenBasedDetailsMapper.xml

@@ -12,7 +12,6 @@
     		and app.id	=	#{value}
     		and tbd.id	=	#{value}
     		and tbd.id	=	app.id
-    		and status	=	1
     </select>
 	
 </mapper>