[Ils-source] r1431 - trunk/src/com/resolutions/ils/data

[scribe at crosswire.org]

Author: scribe
Date: 2016-04-06 16:45:53 -0700 (Wed, 06 Apr 2016)
New Revision: 1431

Modified:
   trunk/src/com/resolutions/ils/data/UserProfile.java
Log:
Added COMPANYID to employee search so getWorkgroups() works


Modified: trunk/src/com/resolutions/ils/data/UserProfile.java
===================================================================
--- trunk/src/com/resolutions/ils/data/UserProfile.java	2016-04-06 23:25:47 UTC (rev 1430)
+++ trunk/src/com/resolutions/ils/data/UserProfile.java	2016-04-06 23:45:53 UTC (rev 1431)
@@ -394,7 +394,7 @@
 			sql = "SELECT UP2.USERPRID FROM " + tables + " WHERE " + where;
 			sql = USERCOURSESUMMARY + " WHERE U.USERPRID IN ("+sql+") GROUP BY U.USERPRID, U.USERPRLNAME, U.USERPRFNAME, U.USERPRNUM, U.USERPRADDR2, U.USERPRHIREDATE OPTION (RECOMPILE)";
         }
-        else sql = "SELECT UP2.USERPRID, UP2.USERPRLNAME, UP2.USERPRFNAME, UP2.USERPRNUM, UP2.USERPRADDR2, UP2.USERPRHIREDATE, " +
+        else sql = "SELECT UP2.COMPANYID, UP2.USERPRID, UP2.USERPRLNAME, UP2.USERPRFNAME, UP2.USERPRNUM, UP2.USERPRADDR2, UP2.USERPRHIREDATE, " +
                         " (SELECT MAX(GROUPNAME) FROM USERGROUP UG JOIN ILSGROUP IG ON UG.ILSGROUPID=IG.ILSGROUPID AND UG.USERPRID=UP2.USERPRID AND GROUPTYPEID=2) WORKGROUP," + 
                         " (SELECT MAX(GROUPNAME) FROM USERGROUP UG JOIN ILSGROUP IG ON UG.ILSGROUPID=IG.ILSGROUPID AND UG.USERPRID=UP2.USERPRID AND GROUPTYPEID=1) ROLE " +
                         " FROM " + tables + " WHERE " + where;