[Ils-source] r1432 - in branches/1.6: . src/com/resolutions/ils/data

[scribe at crosswire.org]

Author: scribe
Date: 2016-04-06 17:01:51 -0700 (Wed, 06 Apr 2016)
New Revision: 1432

Modified:
   branches/1.6/
   branches/1.6/src/com/resolutions/ils/data/UserProfile.java
Log:
merged in fix for getWorkgroups and getRoles by adding COMPANYID to employee search SQL



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429
   + /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332,1334-1335,1337,1339,1349-1356,1359-1365,1369,1373-1374,1380-1383,1391,1393,1401-1404,1407,1409,1412,1416-1419,1421-1424,1427,1429,1431

Modified: branches/1.6/src/com/resolutions/ils/data/UserProfile.java
===================================================================
--- branches/1.6/src/com/resolutions/ils/data/UserProfile.java	2016-04-06 23:45:53 UTC (rev 1431)
+++ branches/1.6/src/com/resolutions/ils/data/UserProfile.java	2016-04-07 00:01:51 UTC (rev 1432)
@@ -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;